use new engine by default in suite tests

3155 files changed, 3194 insertions, 3236 deletions

diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-boolean.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-boolean.test_/query_1.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-boolean.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-boolean.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-boolean.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-boolean.test_/query_2.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-boolean.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-boolean.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-boolean.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-boolean.test_/query_3.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-boolean.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-boolean.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-boolean.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-boolean.test_/query_4.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-boolean.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-boolean.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-boolean.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-boolean.test_/query_5.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-boolean.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-boolean.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_1.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_10.plan
index 2c0613d030a..b311c9ae320 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_case.test_plan\\/CASE_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\"\n                ],\n              \"limit\":\"\\\"1001\\\"\",\n              \"columns\":\n                [\n                  \"i\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_case.test_plan\\/CASE_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\"\n            ],\n          \"limit\":\"1001\",\n          \"columns\":\n            [\n              \"i\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"i\"\n                                      ],\n                                    \"ReadLimit\":\"1001\",\n                                    \"ReadRange\":\n                                      [\n                                        \"i (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_case.test_plan\\/CASE_TBL\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_case.test_plan\\/CASE_TBL\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_11.plan
index bcb6409dd03..3d64e62129b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_case.test_plan\\/CASE_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\"\n                ],\n              \"columns\":\n                [\n                  \"i\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_case.test_plan\\/CASE_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"i\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.Simplest_Math\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"i\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"i (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_case.test_plan\\/CASE_TBL\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_case.test_plan\\/CASE_TBL\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"Simplest_Math (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_12.plan
index 2c0613d030a..b311c9ae320 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_case.test_plan\\/CASE_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\"\n                ],\n              \"limit\":\"\\\"1001\\\"\",\n              \"columns\":\n                [\n                  \"i\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_case.test_plan\\/CASE_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\"\n            ],\n          \"limit\":\"1001\",\n          \"columns\":\n            [\n              \"i\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"i\"\n                                      ],\n                                    \"ReadLimit\":\"1001\",\n                                    \"ReadRange\":\n                                      [\n                                        \"i (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_case.test_plan\\/CASE_TBL\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_case.test_plan\\/CASE_TBL\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_13.plan
index 2c0613d030a..b311c9ae320 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_case.test_plan\\/CASE_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\"\n                ],\n              \"limit\":\"\\\"1001\\\"\",\n              \"columns\":\n                [\n                  \"i\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_case.test_plan\\/CASE_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\"\n            ],\n          \"limit\":\"1001\",\n          \"columns\":\n            [\n              \"i\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"i\"\n                                      ],\n                                    \"ReadLimit\":\"1001\",\n                                    \"ReadRange\":\n                                      [\n                                        \"i (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_case.test_plan\\/CASE_TBL\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_case.test_plan\\/CASE_TBL\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_14.plan
index 8112f3e01dc..6c00311923b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_case.test_plan\\/CASE_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\"\n                ],\n              \"columns\":\n                [\n                  \"f\",\n                  \"i\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_case.test_plan\\/CASE_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"f\",\n              \"i\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 == 4\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"f\",\n                                        \"i\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"i (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_case.test_plan\\/CASE_TBL\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_case.test_plan\\/CASE_TBL\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_2.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_3.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_4.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_5.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_6.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_7.plan
index 2c0613d030a..b311c9ae320 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_case.test_plan\\/CASE_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\"\n                ],\n              \"limit\":\"\\\"1001\\\"\",\n              \"columns\":\n                [\n                  \"i\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_case.test_plan\\/CASE_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\"\n            ],\n          \"limit\":\"1001\",\n          \"columns\":\n            [\n              \"i\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"i\"\n                                      ],\n                                    \"ReadLimit\":\"1001\",\n                                    \"ReadRange\":\n                                      [\n                                        \"i (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_case.test_plan\\/CASE_TBL\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_case.test_plan\\/CASE_TBL\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_8.plan
index 2c0613d030a..b311c9ae320 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_case.test_plan\\/CASE_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\"\n                ],\n              \"limit\":\"\\\"1001\\\"\",\n              \"columns\":\n                [\n                  \"i\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_case.test_plan\\/CASE_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\"\n            ],\n          \"limit\":\"1001\",\n          \"columns\":\n            [\n              \"i\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"i\"\n                                      ],\n                                    \"ReadLimit\":\"1001\",\n                                    \"ReadRange\":\n                                      [\n                                        \"i (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_case.test_plan\\/CASE_TBL\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_case.test_plan\\/CASE_TBL\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_9.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_1.plan
index cd5ff0f467a..1e94a009988 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/coalesce-and-join.test_plan\\/a\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"x\",\n                  \"y\"\n                ],\n              \"columns\":\n                [\n                  \"x\",\n                  \"y\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/coalesce-and-join.test_plan\\/b\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"x (expr)\"\n                ],\n              \"columns\":\n                [\n                  \"x\"\n                ]\n            },\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"x (expr)\"\n                ],\n              \"columns\":\n                [\n                  \"x\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/coalesce-and-join.test_plan\\/a\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"x (-\u221e, +\u221e)\",\n              \"y (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"x\",\n              \"y\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/coalesce-and-join.test_plan\\/b\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"x\"\n            ]\n        },\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"x\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"x\",\n                                        \"y\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"x (-\u221e, +\u221e)\",\n                                        \"y (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/coalesce-and-join.test_plan\\/a\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/coalesce-and-join.test_plan\\/a\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.x)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_2_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":10,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_2_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.x)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TablePointLookup\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"x\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/coalesce-and-join.test_plan\\/b\"\n                                                          },\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/coalesce-and-join.test_plan\\/b\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_2_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_3_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_3_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_4_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.a_y\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_4_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_2_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_4_0\",\n                                                      \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.x)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TablePointLookup\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"x\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/coalesce-and-join.test_plan\\/b\"\n                                                          },\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_3_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/coalesce-and-join.test_plan\\/b\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"a_y (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_2.plan
index 1b52a5f660e..a75d78611a5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/coalesce-and-join.test_plan\\/a\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"x\",\n                  \"y\"\n                ],\n              \"columns\":\n                [\n                  \"x\",\n                  \"y\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/coalesce-and-join.test_plan\\/b\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"x (expr)\"\n                ],\n              \"columns\":\n                [\n                  \"x\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/coalesce-and-join.test_plan\\/a\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"x (-\u221e, +\u221e)\",\n              \"y (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"x\",\n              \"y\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/coalesce-and-join.test_plan\\/b\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"x\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"x\",\n                                        \"y\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"x (-\u221e, +\u221e)\",\n                                        \"y (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/coalesce-and-join.test_plan\\/a\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/coalesce-and-join.test_plan\\/a\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.x)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.a_y\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_2_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.x)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TablePointLookup\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"x\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/coalesce-and-join.test_plan\\/b\"\n                                                          },\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/coalesce-and-join.test_plan\\/b\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"a_y (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_3.plan
index c7800ad03a2..60fb8aae6d6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/coalesce-and-join.test_plan\\/a\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"x (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"y\"\n                ],\n              \"columns\":\n                [\n                  \"x\",\n                  \"y\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/coalesce-and-join.test_plan\\/b\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"x\"\n                ],\n              \"columns\":\n                [\n                  \"x\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/coalesce-and-join.test_plan\\/a\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"x\",\n              \"y\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/coalesce-and-join.test_plan\\/b\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"x (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"x\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"x\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"x (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/coalesce-and-join.test_plan\\/b\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/coalesce-and-join.test_plan\\/b\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.x)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.pv_x\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_2_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.x)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TablePointLookup\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"x\",\n                                                                \"y\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/coalesce-and-join.test_plan\\/a\"\n                                                          },\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/coalesce-and-join.test_plan\\/a\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"pv_x (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_4.plan
index 83b00c42ba9..d08b14307da 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/coalesce-and-join.test_plan\\/xx\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"pkxx (expr)\"\n                ],\n              \"columns\":\n                [\n                  \"pkxx\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/coalesce-and-join.test_plan\\/yy\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"pkxx\",\n                  \"pkyy\"\n                ],\n              \"columns\":\n                [\n                  \"pkxx\",\n                  \"pkyy\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/coalesce-and-join.test_plan\\/xx\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"pkxx\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/coalesce-and-join.test_plan\\/yy\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"pkxx (-\u221e, +\u221e)\",\n              \"pkyy (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"pkxx\",\n              \"pkyy\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"pkxx\",\n                                        \"pkyy\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"pkxx (-\u221e, +\u221e)\",\n                                        \"pkyy (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/coalesce-and-join.test_plan\\/yy\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/coalesce-and-join.test_plan\\/yy\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.yy_pkyy\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_2_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.pkxx)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TablePointLookup\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"pkxx\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/coalesce-and-join.test_plan\\/xx\"\n                                                          },\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/coalesce-and-join.test_plan\\/xx\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"yy_pkyy (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_5.plan
index e2e6335367a..4a3c2fa090a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/coalesce-and-join.test_plan\\/xx\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"pkxx\"\n                ],\n              \"columns\":\n                [\n                  \"pkxx\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/coalesce-and-join.test_plan\\/yy\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"pkxx\",\n                  \"pkyy\"\n                ],\n              \"columns\":\n                [\n                  \"pkxx\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/coalesce-and-join.test_plan\\/xx\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"pkxx (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"pkxx\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/coalesce-and-join.test_plan\\/yy\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"pkxx (-\u221e, +\u221e)\",\n              \"pkyy (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"pkxx\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"pkxx\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"pkxx (-\u221e, +\u221e)\",\n                                                                \"pkyy (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/coalesce-and-join.test_plan\\/yy\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/coalesce-and-join.test_plan\\/yy\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"pkxx\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"pkxx (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/coalesce-and-join.test_plan\\/xx\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/coalesce-and-join.test_plan\\/xx\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_1.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_2.plan
index cd3dee47ca2..932b6e5d33e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join-group-by-with-null.test_plan\\/int8_tbl\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"q1\",\n                  \"q2\"\n                ],\n              \"columns\":\n                [\n                  \"q1\",\n                  \"q2\"\n                ]\n            },\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"q1 (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"q2\"\n                ],\n              \"columns\":\n                [\n                  \"q1\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join-group-by-with-null.test_plan\\/int8_tbl\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"q1 (-\u221e, +\u221e)\",\n              \"q2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"q1\",\n              \"q2\"\n            ]\n        },\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"q1\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"q1\",\n                                        \"q2\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"q1 (-\u221e, +\u221e)\",\n                                        \"q2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join-group-by-with-null.test_plan\\/int8_tbl\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join-group-by-with-null.test_plan\\/int8_tbl\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.q2)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":12,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":11,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":10,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.q2\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":9,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"t1.q2\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":8,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"LeftJoin (MapJoin)\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"LeftJoin (MapJoin)\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":7,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"Map\",\n                                                \"PlanNodeId\":6,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":5\n                                                    }\n                                                  ]\n                                              },\n                                              {\n                                                \"Node Type\":\"Broadcast\",\n                                                \"PlanNodeId\":4,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"Collect\",\n                                                      \"PlanNodeId\":3,\n                                                      \"Plans\":\n                                                        [\n                                                          {\n                                                            \"Node Type\":\"UnionAll\",\n                                                            \"PlanNodeId\":2,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"CTE Name\":\"tx_result_binding_2_0\",\n                                                                  \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                                  \"Operators\":\n                                                                    [\n                                                                      {\n                                                                        \"Name\":\"Filter\",\n                                                                        \"Predicate\":\"Exist(item.q1)\"\n                                                                      },\n                                                                      {\n                                                                        \"Name\":\"TablePointLookup\",\n                                                                        \"ReadColumns\":\n                                                                          [\n                                                                            \"q1\"\n                                                                          ],\n                                                                        \"Table\":\"postgres_jointest\\/join-group-by-with-null.test_plan\\/int8_tbl\"\n                                                                      },\n                                                                      {\n                                                                        \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                                        \"Name\":\"Iterator\"\n                                                                      }\n                                                                    ],\n                                                                  \"PlanNodeId\":1,\n                                                                  \"Tables\":\n                                                                    [\n                                                                      \"postgres_jointest\\/join-group-by-with-null.test_plan\\/int8_tbl\"\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          }\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"q2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_3.plan
index 985c3f01be3..fdcef9e8a2a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join-group-by-with-null.test_plan\\/int8_tbl\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"q1\",\n                  \"q2\"\n                ],\n              \"columns\":\n                [\n                  \"q2\"\n                ]\n            },\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"q1 (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"q2\"\n                ],\n              \"columns\":\n                [\n                  \"q1\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join-group-by-with-null.test_plan\\/int8_tbl\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"q1 (-\u221e, +\u221e)\",\n              \"q2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"q2\"\n            ]\n        },\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"q1\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"q2\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"q1 (-\u221e, +\u221e)\",\n                                        \"q2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join-group-by-with-null.test_plan\\/int8_tbl\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join-group-by-with-null.test_plan\\/int8_tbl\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.q2)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":12,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":11,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":10,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.q2\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":9,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"t1.q2\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":8,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"LeftJoin (MapJoin)\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"LeftJoin (MapJoin)\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":7,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"Map\",\n                                                \"PlanNodeId\":6,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":5\n                                                    }\n                                                  ]\n                                              },\n                                              {\n                                                \"Node Type\":\"Broadcast\",\n                                                \"PlanNodeId\":4,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"Collect\",\n                                                      \"PlanNodeId\":3,\n                                                      \"Plans\":\n                                                        [\n                                                          {\n                                                            \"Node Type\":\"UnionAll\",\n                                                            \"PlanNodeId\":2,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"CTE Name\":\"tx_result_binding_2_0\",\n                                                                  \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                                  \"Operators\":\n                                                                    [\n                                                                      {\n                                                                        \"Name\":\"Filter\",\n                                                                        \"Predicate\":\"Exist(item.q1)\"\n                                                                      },\n                                                                      {\n                                                                        \"Name\":\"TablePointLookup\",\n                                                                        \"ReadColumns\":\n                                                                          [\n                                                                            \"q1\"\n                                                                          ],\n                                                                        \"Table\":\"postgres_jointest\\/join-group-by-with-null.test_plan\\/int8_tbl\"\n                                                                      },\n                                                                      {\n                                                                        \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                                        \"Name\":\"Iterator\"\n                                                                      }\n                                                                    ],\n                                                                  \"PlanNodeId\":1,\n                                                                  \"Tables\":\n                                                                    [\n                                                                      \"postgres_jointest\\/join-group-by-with-null.test_plan\\/int8_tbl\"\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          }\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"q2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_4.plan
index c377e5b4268..af52048c42f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join-group-by-with-null.test_plan\\/int8_tbl\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"q1\",\n                  \"q2\"\n                ],\n              \"columns\":\n                [\n                  \"q2\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"q1\",\n                  \"q2\"\n                ],\n              \"limit\":\"\\\"10\\\"\",\n              \"columns\":\n                [\n                  \"q1\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join-group-by-with-null.test_plan\\/int8_tbl\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"q1 (-\u221e, +\u221e)\",\n              \"q2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"q1\",\n              \"q2\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"q1 (-\u221e, +\u221e)\",\n              \"q2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"q1\",\n              \"q2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":14,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":13,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":12,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.q2\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":11,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"t1.q2\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":10,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"LeftJoin (MapJoin)\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"LeftJoin (MapJoin)\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":9,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"Map\",\n                                                \"PlanNodeId\":8,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"q1\",\n                                                                \"q2\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"q1 (-\u221e, +\u221e)\",\n                                                                \"q2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join-group-by-with-null.test_plan\\/int8_tbl\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":7,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join-group-by-with-null.test_plan\\/int8_tbl\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              },\n                                              {\n                                                \"Node Type\":\"Broadcast\",\n                                                \"PlanNodeId\":6,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"Collect\",\n                                                      \"PlanNodeId\":5,\n                                                      \"Plans\":\n                                                        [\n                                                          {\n                                                            \"Node Type\":\"UnionAll\",\n                                                            \"PlanNodeId\":4,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"Limit\",\n                                                                  \"Operators\":\n                                                                    [\n                                                                      {\n                                                                        \"Limit\":\"10\",\n                                                                        \"Name\":\"Limit\"\n                                                                      }\n                                                                    ],\n                                                                  \"PlanNodeId\":3,\n                                                                  \"Plans\":\n                                                                    [\n                                                                      {\n                                                                        \"Node Type\":\"UnionAll\",\n                                                                        \"PlanNodeId\":2,\n                                                                        \"PlanNodeType\":\"Connection\",\n                                                                        \"Plans\":\n                                                                          [\n                                                                            {\n                                                                              \"Node Type\":\"Limit-TableFullScan\",\n                                                                              \"Operators\":\n                                                                                [\n                                                                                  {\n                                                                                    \"Limit\":\"10\",\n                                                                                    \"Name\":\"Limit\"\n                                                                                  },\n                                                                                  {\n                                                                                    \"Name\":\"TableFullScan\",\n                                                                                    \"ReadColumns\":\n                                                                                      [\n                                                                                        \"q1\",\n                                                                                        \"q2\"\n                                                                                      ],\n                                                                                    \"ReadRange\":\n                                                                                      [\n                                                                                        \"q1 (-\u221e, +\u221e)\",\n                                                                                        \"q2 (-\u221e, +\u221e)\"\n                                                                                      ],\n                                                                                    \"Table\":\"postgres_jointest\\/join-group-by-with-null.test_plan\\/int8_tbl\"\n                                                                                  }\n                                                                                ],\n                                                                              \"PlanNodeId\":1,\n                                                                              \"Tables\":\n                                                                                [\n                                                                                  \"postgres_jointest\\/join-group-by-with-null.test_plan\\/int8_tbl\"\n                                                                                ]\n                                                                            }\n                                                                          ]\n                                                                      }\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          }\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"q2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_5.plan
index ac4a8e37eda..8335b4199a2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join-group-by-with-null.test_plan\\/int8_tbl\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"q1\",\n                  \"q2\"\n                ],\n              \"columns\":\n                [\n                  \"q1\",\n                  \"q2\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"q1\",\n                  \"q2\"\n                ],\n              \"columns\":\n                [\n                  \"q2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join-group-by-with-null.test_plan\\/int8_tbl\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"q1 (-\u221e, +\u221e)\",\n              \"q2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"q1\",\n              \"q2\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"q1 (-\u221e, +\u221e)\",\n              \"q2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"q1\",\n              \"q2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":12,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":11,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":10,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.q2\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":9,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"t1.q2\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":8,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"LeftJoin (MapJoin)\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"LeftJoin (MapJoin)\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":7,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"Map\",\n                                                \"PlanNodeId\":6,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"q1\",\n                                                                \"q2\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"q1 (-\u221e, +\u221e)\",\n                                                                \"q2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join-group-by-with-null.test_plan\\/int8_tbl\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":5,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join-group-by-with-null.test_plan\\/int8_tbl\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              },\n                                              {\n                                                \"Node Type\":\"Broadcast\",\n                                                \"PlanNodeId\":4,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"Collect\",\n                                                      \"PlanNodeId\":3,\n                                                      \"Plans\":\n                                                        [\n                                                          {\n                                                            \"Node Type\":\"UnionAll\",\n                                                            \"PlanNodeId\":2,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"TableFullScan\",\n                                                                  \"Operators\":\n                                                                    [\n                                                                      {\n                                                                        \"Name\":\"TableFullScan\",\n                                                                        \"ReadColumns\":\n                                                                          [\n                                                                            \"q1\",\n                                                                            \"q2\"\n                                                                          ],\n                                                                        \"ReadRange\":\n                                                                          [\n                                                                            \"q1 (-\u221e, +\u221e)\",\n                                                                            \"q2 (-\u221e, +\u221e)\"\n                                                                          ],\n                                                                        \"Table\":\"postgres_jointest\\/join-group-by-with-null.test_plan\\/int8_tbl\"\n                                                                      }\n                                                                    ],\n                                                                  \"PlanNodeId\":1,\n                                                                  \"Tables\":\n                                                                    [\n                                                                      \"postgres_jointest\\/join-group-by-with-null.test_plan\\/int8_tbl\"\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          }\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"q2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_1.plan
index a795d8dd227..908e2272b4b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/int8_tbl\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"q1\",\n                  \"q2\"\n                ],\n              \"columns\":\n                [\n                  \"q1\",\n                  \"q2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/int8_tbl\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"q1 (-\u221e, +\u221e)\",\n              \"q2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"q1\",\n              \"q2\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"q1 (-\u221e, +\u221e)\",\n              \"q2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"q1\",\n              \"q2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"InnerJoin (MapJoin)-Filter-TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"InnerJoin (MapJoin)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(items0)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"q1\",\n                                                                \"q2\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"q1 (-\u221e, +\u221e)\",\n                                                                \"q2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join0.test_plan\\/int8_tbl\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join0.test_plan\\/int8_tbl\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"q1\",\n                                                    \"q2\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"q1 (-\u221e, +\u221e)\",\n                                                    \"q2 (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join0.test_plan\\/int8_tbl\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join0.test_plan\\/int8_tbl\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"i1q1 (Asc)\",\n                            \"i1q2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_10.plan
index 5ca68c4a1b0..5bf7ee4f0be 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/int8_tbl\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"q1\",\n                  \"q2\"\n                ],\n              \"columns\":\n                [\n                  \"q1\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"hundred\",\n                  \"thousand\",\n                  \"unique2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/int8_tbl\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"q1 (-\u221e, +\u221e)\",\n              \"q2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"q1\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"hundred\",\n              \"thousand\",\n              \"unique2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Filter-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"item.b.thousand == item.a.q1 And item.a.q1 == item.b.hundred\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"hundred\",\n                                                                \"thousand\",\n                                                                \"unique2\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"unique1 (-\u221e, +\u221e)\",\n                                                                \"unique2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"q1\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"q1 (-\u221e, +\u221e)\",\n                                                    \"q2 (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join0.test_plan\\/int8_tbl\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join0.test_plan\\/int8_tbl\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_11.plan
index 0b69fcc3c7a..b9eae9953f9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/int4_tbl\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"f1\"\n                ],\n              \"columns\":\n                [\n                  \"f1\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"unique2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/int4_tbl\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"f1 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"f1\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"unique2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"unique2\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"unique1 (-\u221e, +\u221e)\",\n                                                                \"unique2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"f1\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"f1 (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join0.test_plan\\/int4_tbl\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join0.test_plan\\/int4_tbl\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_12.plan
index 676a95f9e61..95a909a0057 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"thousand\",\n                  \"twothousand\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"twothousand\",\n                  \"unique1\",\n                  \"unique2\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"unique2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"thousand\",\n              \"twothousand\",\n              \"unique1\",\n              \"unique2\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"thousand\",\n              \"twothousand\",\n              \"unique1\",\n              \"unique2\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"thousand\",\n              \"twothousand\",\n              \"unique1\",\n              \"unique2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":16,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":15,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":14,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":13,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"thousand\",\n                                                                \"twothousand\",\n                                                                \"unique1\",\n                                                                \"unique2\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"unique1 (-\u221e, +\u221e)\",\n                                                                \"unique2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":12,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"LeftJoin (MapJoin)\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"LeftJoin (MapJoin)\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":11,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"Map\",\n                                                \"PlanNodeId\":10,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"Filter-TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"items3 \\u003C 10\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"thousand\",\n                                                                \"twothousand\",\n                                                                \"unique1\",\n                                                                \"unique2\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"unique1 (-\u221e, +\u221e)\",\n                                                                \"unique2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":9,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              },\n                                              {\n                                                \"Node Type\":\"Broadcast\",\n                                                \"PlanNodeId\":8,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"Collect\",\n                                                      \"PlanNodeId\":7,\n                                                      \"Plans\":\n                                                        [\n                                                          {\n                                                            \"Node Type\":\"UnionAll\",\n                                                            \"PlanNodeId\":6,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"TableFullScan\",\n                                                                  \"Operators\":\n                                                                    [\n                                                                      {\n                                                                        \"Name\":\"TableFullScan\",\n                                                                        \"ReadColumns\":\n                                                                          [\n                                                                            \"thousand\",\n                                                                            \"twothousand\",\n                                                                            \"unique1\",\n                                                                            \"unique2\"\n                                                                          ],\n                                                                        \"ReadRange\":\n                                                                          [\n                                                                            \"unique1 (-\u221e, +\u221e)\",\n                                                                            \"unique2 (-\u221e, +\u221e)\"\n                                                                          ],\n                                                                        \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                      }\n                                                                    ],\n                                                                  \"PlanNodeId\":5,\n                                                                  \"Tables\":\n                                                                    [\n                                                                      \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          }\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_13.plan
index 0b69fcc3c7a..93bfad27913 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/int4_tbl\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"f1\"\n                ],\n              \"columns\":\n                [\n                  \"f1\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"unique2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/int4_tbl\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"f1 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"f1\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"unique2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":16,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":15,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":14,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":13,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":10,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":9,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":8,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"LeftJoin (MapJoin)\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"LeftJoin (MapJoin)\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":7,\n                                                      \"Plans\":\n                                                        [\n                                                          {\n                                                            \"Node Type\":\"Broadcast\",\n                                                            \"PlanNodeId\":4,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"Collect\",\n                                                                  \"PlanNodeId\":3,\n                                                                  \"Plans\":\n                                                                    [\n                                                                      {\n                                                                        \"Node Type\":\"UnionAll\",\n                                                                        \"PlanNodeId\":2,\n                                                                        \"PlanNodeType\":\"Connection\",\n                                                                        \"Plans\":\n                                                                          [\n                                                                            {\n                                                                              \"Node Type\":\"TableFullScan\",\n                                                                              \"Operators\":\n                                                                                [\n                                                                                  {\n                                                                                    \"Name\":\"TableFullScan\",\n                                                                                    \"ReadColumns\":\n                                                                                      [\n                                                                                        \"unique2\"\n                                                                                      ],\n                                                                                    \"ReadRange\":\n                                                                                      [\n                                                                                        \"unique1 (-\u221e, +\u221e)\",\n                                                                                        \"unique2 (-\u221e, +\u221e)\"\n                                                                                      ],\n                                                                                    \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                                  }\n                                                                                ],\n                                                                              \"PlanNodeId\":1,\n                                                                              \"Tables\":\n                                                                                [\n                                                                                  \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                                ]\n                                                                            }\n                                                                          ]\n                                                                      }\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          },\n                                                          {\n                                                            \"Node Type\":\"Map\",\n                                                            \"PlanNodeId\":6,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"TableFullScan\",\n                                                                  \"Operators\":\n                                                                    [\n                                                                      {\n                                                                        \"Name\":\"TableFullScan\",\n                                                                        \"ReadColumns\":\n                                                                          [\n                                                                            \"f1\"\n                                                                          ],\n                                                                        \"ReadRange\":\n                                                                          [\n                                                                            \"f1 (-\u221e, +\u221e)\"\n                                                                          ],\n                                                                        \"Table\":\"postgres_jointest\\/join0.test_plan\\/int4_tbl\"\n                                                                      }\n                                                                    ],\n                                                                  \"PlanNodeId\":5,\n                                                                  \"Tables\":\n                                                                    [\n                                                                      \"postgres_jointest\\/join0.test_plan\\/int4_tbl\"\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          }\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":12,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"[{join_key: 0},{join_key: 1}]\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":11\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_14.plan
index 7af9534d693..c1024c696d1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"even\",\n                  \"fivethous\",\n                  \"four\",\n                  \"hundred\",\n                  \"odd\",\n                  \"string4\",\n                  \"stringu1\",\n                  \"stringu2\",\n                  \"ten\",\n                  \"tenthous\",\n                  \"thousand\",\n                  \"twenty\",\n                  \"two\",\n                  \"twothousand\",\n                  \"unique1\",\n                  \"unique2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"even\",\n              \"fivethous\",\n              \"four\",\n              \"hundred\",\n              \"odd\",\n              \"string4\",\n              \"stringu1\",\n              \"stringu2\",\n              \"ten\",\n              \"tenthous\",\n              \"thousand\",\n              \"twenty\",\n              \"two\",\n              \"twothousand\",\n              \"unique1\",\n              \"unique2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":14,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":13,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":12,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":11,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":8,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":7,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":6,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"FullJoin (JoinDict)-ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"FullJoin (JoinDict)\"\n                                                          },\n                                                          {\n                                                            \"Iterator\":\"[{id: 1}]\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":5,\n                                                      \"Plans\":\n                                                        [\n                                                          {\n                                                            \"KeyColumns\":\n                                                              [\n                                                                \"unique1\"\n                                                              ],\n                                                            \"Node Type\":\"HashShuffle\",\n                                                            \"PlanNodeId\":4,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"Collect\",\n                                                                  \"PlanNodeId\":3,\n                                                                  \"Plans\":\n                                                                    [\n                                                                      {\n                                                                        \"Node Type\":\"UnionAll\",\n                                                                        \"PlanNodeId\":2,\n                                                                        \"PlanNodeType\":\"Connection\",\n                                                                        \"Plans\":\n                                                                          [\n                                                                            {\n                                                                              \"Node Type\":\"TableFullScan\",\n                                                                              \"Operators\":\n                                                                                [\n                                                                                  {\n                                                                                    \"Name\":\"TableFullScan\",\n                                                                                    \"ReadColumns\":\n                                                                                      [\n                                                                                        \"even\",\n                                                                                        \"fivethous\",\n                                                                                        \"four\",\n                                                                                        \"hundred\",\n                                                                                        \"odd\",\n                                                                                        \"string4\",\n                                                                                        \"stringu1\",\n                                                                                        \"stringu2\",\n                                                                                        \"ten\",\n                                                                                        \"tenthous\",\n                                                                                        \"thousand\",\n                                                                                        \"twenty\",\n                                                                                        \"two\",\n                                                                                        \"twothousand\",\n                                                                                        \"unique1\",\n                                                                                        \"unique2\"\n                                                                                      ],\n                                                                                    \"ReadRange\":\n                                                                                      [\n                                                                                        \"unique1 (-\u221e, +\u221e)\",\n                                                                                        \"unique2 (-\u221e, +\u221e)\"\n                                                                                      ],\n                                                                                    \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                                  }\n                                                                                ],\n                                                                              \"PlanNodeId\":1,\n                                                                              \"Tables\":\n                                                                                [\n                                                                                  \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                                ]\n                                                                            }\n                                                                          ]\n                                                                      }\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          }\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":10,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"[{id: 1}]\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":9\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_15.plan
index b10a341a798..55ebe0b8151 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/int4_tbl\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"f1 (\\\"0\\\")\"\n                ],\n              \"columns\":\n                [\n                  \"f1\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"even\",\n                  \"ten\",\n                  \"unique2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/int4_tbl\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"f1\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"even\",\n              \"ten\",\n              \"unique2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"even\",\n                                                                \"ten\",\n                                                                \"unique2\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"unique1 (-\u221e, +\u221e)\",\n                                                                \"unique2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TablePointLookup-ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TablePointLookup\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"f1\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join0.test_plan\\/int4_tbl\"\n                                              },\n                                              {\n                                                \"Iterator\":\"[{f1: 0}]\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join0.test_plan\\/int4_tbl\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_16.plan
index f224697ab7c..c0d4e518b06 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"unique2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"unique2\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"unique2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":12,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":11,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":10,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Aggregate-Filter-FullJoin (JoinDict)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Nth.unique2 == 42\"\n                                  },\n                                  {\n                                    \"Name\":\"FullJoin (JoinDict)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":9,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"unique2\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"unique2\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"unique1 (-\u221e, +\u221e)\",\n                                                                \"unique2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"unique2\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":8,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":7,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":6,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"unique2\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"unique1 (-\u221e, +\u221e)\",\n                                                                \"unique2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":5,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_2.plan
index 9740d1b665d..648f03e9d93 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/int4_tbl\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"f1\"\n                ],\n              \"columns\":\n                [\n                  \"f1\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"tenthous\",\n                  \"thousand\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/int4_tbl\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"f1 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"f1\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"tenthous\",\n              \"thousand\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"f1\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"f1 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join0.test_plan\\/int4_tbl\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join0.test_plan\\/int4_tbl\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-Aggregate-InnerJoin (MapJoin)-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Inputs\":\n                                      [\n                                        1,\n                                        2\n                                      ],\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"InnerJoin (MapJoin)\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items1)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"tenthous\",\n                                        \"thousand\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"unique1 (-\u221e, +\u221e)\",\n                                        \"unique2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_3.plan
index c8e769765e2..b205eea7a28 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"fivethous\",\n                  \"thousand\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"hundred\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"fivethous\",\n              \"hundred\",\n              \"thousand\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"fivethous\",\n              \"hundred\",\n              \"thousand\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Aggregate-InnerJoin (MapJoin)-Filter\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"InnerJoin (MapJoin)\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(item.hundred)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"Filter-TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(items2) And items0 % 10 \\u003C 10\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"fivethous\",\n                                                                \"hundred\",\n                                                                \"thousand\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"unique1 (-\u221e, +\u221e)\",\n                                                                \"unique2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"fivethous\",\n                                                    \"hundred\",\n                                                    \"thousand\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"unique1 (-\u221e, +\u221e)\",\n                                                    \"unique2 (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_4.plan
index e8bd1b7d18b..f71d109b496 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"hundred\",\n                  \"tenthous\",\n                  \"unique2\"\n                ]\n            },\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"unique1 (\\\"42\\\")\"\n                ],\n              \"scan_by\":\n                [\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"ten\",\n                  \"unique2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"hundred\",\n              \"tenthous\",\n              \"unique2\"\n            ]\n        },\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"unique1 (42)\"\n            ],\n          \"scan_by\":\n            [\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"ten\",\n              \"unique2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Filter-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Not And item.a.ten == 2 Or item.b.hundred == 3\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"hundred\",\n                                                                \"tenthous\",\n                                                                \"unique2\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"unique1 (-\u221e, +\u221e)\",\n                                                                \"unique2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TablePointLookup\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TablePointLookup\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"ten\",\n                                                    \"unique2\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"unique1 (42)\",\n                                                    \"unique2 (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_5.plan
index a9bdd5ddfd8..d1170f2aeb7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/int8_tbl\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"q1\",\n                  \"q2\"\n                ],\n              \"columns\":\n                [\n                  \"q1\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"q1\",\n                  \"q2\"\n                ],\n              \"columns\":\n                [\n                  \"q2\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/int8_tbl\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"q1 (-\u221e, +\u221e)\",\n              \"q2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"q1\",\n              \"q2\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"q1 (-\u221e, +\u221e)\",\n              \"q2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"q1\",\n              \"q2\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"unique1\",\n              \"unique2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":18,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":17,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":16,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-InnerJoin (MapJoin)-Filter\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.qq\"\n                                  },\n                                  {\n                                    \"Name\":\"InnerJoin (MapJoin)\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(item.qq)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":15,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"unique1\",\n                                                                \"unique2\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"unique1 (-\u221e, +\u221e)\",\n                                                                \"unique2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":14,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"FullJoin (JoinDict)\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"FullJoin (JoinDict)\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":13,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"KeyColumns\":\n                                                  [\n                                                    \"qq\"\n                                                  ],\n                                                \"Node Type\":\"HashShuffle\",\n                                                \"PlanNodeId\":12,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"Collect\",\n                                                      \"PlanNodeId\":11,\n                                                      \"Plans\":\n                                                        [\n                                                          {\n                                                            \"Node Type\":\"UnionAll\",\n                                                            \"PlanNodeId\":10,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"TableFullScan\",\n                                                                  \"Operators\":\n                                                                    [\n                                                                      {\n                                                                        \"Name\":\"TableFullScan\",\n                                                                        \"ReadColumns\":\n                                                                          [\n                                                                            \"q1\",\n                                                                            \"q2\"\n                                                                          ],\n                                                                        \"ReadRange\":\n                                                                          [\n                                                                            \"q1 (-\u221e, +\u221e)\",\n                                                                            \"q2 (-\u221e, +\u221e)\"\n                                                                          ],\n                                                                        \"Table\":\"postgres_jointest\\/join0.test_plan\\/int8_tbl\"\n                                                                      }\n                                                                    ],\n                                                                  \"PlanNodeId\":9,\n                                                                  \"Tables\":\n                                                                    [\n                                                                      \"postgres_jointest\\/join0.test_plan\\/int8_tbl\"\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          }\n                                                        ]\n                                                    }\n                                                  ]\n                                              },\n                                              {\n                                                \"KeyColumns\":\n                                                  [\n                                                    \"qq\"\n                                                  ],\n                                                \"Node Type\":\"HashShuffle\",\n                                                \"PlanNodeId\":8,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"Collect\",\n                                                      \"PlanNodeId\":7,\n                                                      \"Plans\":\n                                                        [\n                                                          {\n                                                            \"Node Type\":\"UnionAll\",\n                                                            \"PlanNodeId\":6,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"TableFullScan\",\n                                                                  \"Operators\":\n                                                                    [\n                                                                      {\n                                                                        \"Name\":\"TableFullScan\",\n                                                                        \"ReadColumns\":\n                                                                          [\n                                                                            \"q1\",\n                                                                            \"q2\"\n                                                                          ],\n                                                                        \"ReadRange\":\n                                                                          [\n                                                                            \"q1 (-\u221e, +\u221e)\",\n                                                                            \"q2 (-\u221e, +\u221e)\"\n                                                                          ],\n                                                                        \"Table\":\"postgres_jointest\\/join0.test_plan\\/int8_tbl\"\n                                                                      }\n                                                                    ],\n                                                                  \"PlanNodeId\":5,\n                                                                  \"Tables\":\n                                                                    [\n                                                                      \"postgres_jointest\\/join0.test_plan\\/int8_tbl\"\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          }\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"qq (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_6.plan
index 0ca591e4b2e..f3b4d157541 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/int4_tbl\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"f1\"\n                ],\n              \"columns\":\n                [\n                  \"f1\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/ononequery1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"x1\",\n                  \"x2\"\n                ],\n              \"columns\":\n                [\n                  \"x1\",\n                  \"x2\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/ononequery2\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"y1\",\n                  \"y2\"\n                ],\n              \"columns\":\n                [\n                  \"y1\",\n                  \"y2\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"stringu1\",\n                  \"unique2\"\n                ]\n            },\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"unique1 (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"stringu2\",\n                  \"unique1\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/int4_tbl\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"f1 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"f1\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/ononequery1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"x1 (-\u221e, +\u221e)\",\n              \"x2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"x1\",\n              \"x2\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/ononequery2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"y1 (-\u221e, +\u221e)\",\n              \"y2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"y1\",\n              \"y2\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"stringu1\",\n              \"unique2\"\n            ]\n        },\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"stringu2\",\n              \"unique1\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":22,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":21,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":20,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"InnerJoin (MapJoin)-Filter\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"InnerJoin (MapJoin)\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(item.unique2)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":19,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":16,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":15,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":14,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"LeftJoin (MapJoin)\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"LeftJoin (MapJoin)\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":13,\n                                                      \"Plans\":\n                                                        [\n                                                          {\n                                                            \"Node Type\":\"Broadcast\",\n                                                            \"PlanNodeId\":10,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"Collect\",\n                                                                  \"PlanNodeId\":9,\n                                                                  \"Plans\":\n                                                                    [\n                                                                      {\n                                                                        \"Node Type\":\"UnionAll\",\n                                                                        \"PlanNodeId\":8,\n                                                                        \"PlanNodeType\":\"Connection\",\n                                                                        \"Plans\":\n                                                                          [\n                                                                            {\n                                                                              \"Node Type\":\"LeftJoin (MapJoin)\",\n                                                                              \"Operators\":\n                                                                                [\n                                                                                  {\n                                                                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                                                                  }\n                                                                                ],\n                                                                              \"PlanNodeId\":7,\n                                                                              \"Plans\":\n                                                                                [\n                                                                                  {\n                                                                                    \"Node Type\":\"Map\",\n                                                                                    \"PlanNodeId\":6,\n                                                                                    \"PlanNodeType\":\"Connection\",\n                                                                                    \"Plans\":\n                                                                                      [\n                                                                                        {\n                                                                                          \"Node Type\":\"TableFullScan\",\n                                                                                          \"Operators\":\n                                                                                            [\n                                                                                              {\n                                                                                                \"Name\":\"TableFullScan\",\n                                                                                                \"ReadColumns\":\n                                                                                                  [\n                                                                                                    \"x1\",\n                                                                                                    \"x2\"\n                                                                                                  ],\n                                                                                                \"ReadRange\":\n                                                                                                  [\n                                                                                                    \"x1 (-\u221e, +\u221e)\",\n                                                                                                    \"x2 (-\u221e, +\u221e)\"\n                                                                                                  ],\n                                                                                                \"Table\":\"postgres_jointest\\/join0.test_plan\\/ononequery1\"\n                                                                                              }\n                                                                                            ],\n                                                                                          \"PlanNodeId\":5,\n                                                                                          \"Tables\":\n                                                                                            [\n                                                                                              \"postgres_jointest\\/join0.test_plan\\/ononequery1\"\n                                                                                            ]\n                                                                                        }\n                                                                                      ]\n                                                                                  },\n                                                                                  {\n                                                                                    \"Node Type\":\"Broadcast\",\n                                                                                    \"PlanNodeId\":4,\n                                                                                    \"PlanNodeType\":\"Connection\",\n                                                                                    \"Plans\":\n                                                                                      [\n                                                                                        {\n                                                                                          \"Node Type\":\"Collect\",\n                                                                                          \"PlanNodeId\":3,\n                                                                                          \"Plans\":\n                                                                                            [\n                                                                                              {\n                                                                                                \"Node Type\":\"UnionAll\",\n                                                                                                \"PlanNodeId\":2,\n                                                                                                \"PlanNodeType\":\"Connection\",\n                                                                                                \"Plans\":\n                                                                                                  [\n                                                                                                    {\n                                                                                                      \"Node Type\":\"TableFullScan\",\n                                                                                                      \"Operators\":\n                                                                                                        [\n                                                                                                          {\n                                                                                                            \"Name\":\"TableFullScan\",\n                                                                                                            \"ReadColumns\":\n                                                                                                              [\n                                                                                                                \"y1\",\n                                                                                                                \"y2\"\n                                                                                                              ],\n                                                                                                            \"ReadRange\":\n                                                                                                              [\n                                                                                                                \"y1 (-\u221e, +\u221e)\",\n                                                                                                                \"y2 (-\u221e, +\u221e)\"\n                                                                                                              ],\n                                                                                                            \"Table\":\"postgres_jointest\\/join0.test_plan\\/ononequery2\"\n                                                                                                          }\n                                                                                                        ],\n                                                                                                      \"PlanNodeId\":1,\n                                                                                                      \"Tables\":\n                                                                                                        [\n                                                                                                          \"postgres_jointest\\/join0.test_plan\\/ononequery2\"\n                                                                                                        ]\n                                                                                                    }\n                                                                                                  ]\n                                                                                              }\n                                                                                            ]\n                                                                                        }\n                                                                                      ]\n                                                                                  }\n                                                                                ]\n                                                                            }\n                                                                          ]\n                                                                      }\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          },\n                                                          {\n                                                            \"Node Type\":\"Map\",\n                                                            \"PlanNodeId\":12,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"TableFullScan\",\n                                                                  \"Operators\":\n                                                                    [\n                                                                      {\n                                                                        \"Name\":\"TableFullScan\",\n                                                                        \"ReadColumns\":\n                                                                          [\n                                                                            \"f1\"\n                                                                          ],\n                                                                        \"ReadRange\":\n                                                                          [\n                                                                            \"f1 (-\u221e, +\u221e)\"\n                                                                          ],\n                                                                        \"Table\":\"postgres_jointest\\/join0.test_plan\\/int4_tbl\"\n                                                                      }\n                                                                    ],\n                                                                  \"PlanNodeId\":11,\n                                                                  \"Tables\":\n                                                                    [\n                                                                      \"postgres_jointest\\/join0.test_plan\\/int4_tbl\"\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          }\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":18,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"Exist(items1) And items1 \\u003C 42\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"stringu1\",\n                                                    \"unique2\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"unique1 (-\u221e, +\u221e)\",\n                                                    \"unique2 (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":17,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.subq1.y1)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Filter-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_2_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.unique1)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TablePointLookup\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"stringu2\",\n                                                                \"unique1\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                          },\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_7.plan
index c98c847aa36..607ba5c3724 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"hundred\",\n                  \"thousand\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"ten\",\n                  \"unique2\"\n                ]\n            },\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"unique1 (\\\"1\\\")\"\n                ],\n              \"scan_by\":\n                [\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"hundred\",\n                  \"ten\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"hundred\",\n              \"ten\",\n              \"thousand\",\n              \"unique2\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"hundred\",\n              \"ten\",\n              \"thousand\",\n              \"unique2\"\n            ]\n        },\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"unique1 (1)\"\n            ],\n          \"scan_by\":\n            [\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"hundred\",\n              \"ten\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":16,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":15,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":14,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Aggregate-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":13,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":10,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":9,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":8,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"InnerJoin (MapJoin)-Filter\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"InnerJoin (MapJoin)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.thousand)\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":7,\n                                                      \"Plans\":\n                                                        [\n                                                          {\n                                                            \"Node Type\":\"Broadcast\",\n                                                            \"PlanNodeId\":4,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"Collect\",\n                                                                  \"PlanNodeId\":3,\n                                                                  \"Plans\":\n                                                                    [\n                                                                      {\n                                                                        \"Node Type\":\"UnionAll\",\n                                                                        \"PlanNodeId\":2,\n                                                                        \"PlanNodeType\":\"Connection\",\n                                                                        \"Plans\":\n                                                                          [\n                                                                            {\n                                                                              \"Node Type\":\"TableFullScan\",\n                                                                              \"Operators\":\n                                                                                [\n                                                                                  {\n                                                                                    \"Name\":\"TableFullScan\",\n                                                                                    \"ReadColumns\":\n                                                                                      [\n                                                                                        \"hundred\",\n                                                                                        \"ten\",\n                                                                                        \"thousand\",\n                                                                                        \"unique2\"\n                                                                                      ],\n                                                                                    \"ReadRange\":\n                                                                                      [\n                                                                                        \"unique1 (-\u221e, +\u221e)\",\n                                                                                        \"unique2 (-\u221e, +\u221e)\"\n                                                                                      ],\n                                                                                    \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                                  }\n                                                                                ],\n                                                                              \"PlanNodeId\":1,\n                                                                              \"Tables\":\n                                                                                [\n                                                                                  \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                                ]\n                                                                            }\n                                                                          ]\n                                                                      }\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          },\n                                                          {\n                                                            \"Node Type\":\"Map\",\n                                                            \"PlanNodeId\":6,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"TableFullScan\",\n                                                                  \"Operators\":\n                                                                    [\n                                                                      {\n                                                                        \"Name\":\"TableFullScan\",\n                                                                        \"ReadColumns\":\n                                                                          [\n                                                                            \"hundred\",\n                                                                            \"ten\",\n                                                                            \"thousand\",\n                                                                            \"unique2\"\n                                                                          ],\n                                                                        \"ReadRange\":\n                                                                          [\n                                                                            \"unique1 (-\u221e, +\u221e)\",\n                                                                            \"unique2 (-\u221e, +\u221e)\"\n                                                                          ],\n                                                                        \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                      }\n                                                                    ],\n                                                                  \"PlanNodeId\":5,\n                                                                  \"Tables\":\n                                                                    [\n                                                                      \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          }\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":12,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TablePointLookup\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TablePointLookup\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"hundred\",\n                                                    \"ten\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"unique1 (1)\",\n                                                    \"unique2 (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":11,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_8.plan
index 741b9846089..582568a4d2d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"hundred\",\n                  \"ten\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"hundred\",\n                  \"ten\",\n                  \"thousand\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"ten\",\n                  \"unique2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"hundred\",\n              \"ten\",\n              \"thousand\",\n              \"unique2\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"hundred\",\n              \"ten\",\n              \"thousand\",\n              \"unique2\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"hundred\",\n              \"ten\",\n              \"thousand\",\n              \"unique2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":16,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":15,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":14,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Aggregate-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":13,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":10,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":9,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":8,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"InnerJoin (MapJoin)-Filter\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"InnerJoin (MapJoin)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.thousand)\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":7,\n                                                      \"Plans\":\n                                                        [\n                                                          {\n                                                            \"Node Type\":\"Broadcast\",\n                                                            \"PlanNodeId\":4,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"Collect\",\n                                                                  \"PlanNodeId\":3,\n                                                                  \"Plans\":\n                                                                    [\n                                                                      {\n                                                                        \"Node Type\":\"UnionAll\",\n                                                                        \"PlanNodeId\":2,\n                                                                        \"PlanNodeType\":\"Connection\",\n                                                                        \"Plans\":\n                                                                          [\n                                                                            {\n                                                                              \"Node Type\":\"TableFullScan\",\n                                                                              \"Operators\":\n                                                                                [\n                                                                                  {\n                                                                                    \"Name\":\"TableFullScan\",\n                                                                                    \"ReadColumns\":\n                                                                                      [\n                                                                                        \"hundred\",\n                                                                                        \"ten\",\n                                                                                        \"thousand\",\n                                                                                        \"unique2\"\n                                                                                      ],\n                                                                                    \"ReadRange\":\n                                                                                      [\n                                                                                        \"unique1 (-\u221e, +\u221e)\",\n                                                                                        \"unique2 (-\u221e, +\u221e)\"\n                                                                                      ],\n                                                                                    \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                                  }\n                                                                                ],\n                                                                              \"PlanNodeId\":1,\n                                                                              \"Tables\":\n                                                                                [\n                                                                                  \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                                ]\n                                                                            }\n                                                                          ]\n                                                                      }\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          },\n                                                          {\n                                                            \"Node Type\":\"Map\",\n                                                            \"PlanNodeId\":6,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"TableFullScan\",\n                                                                  \"Operators\":\n                                                                    [\n                                                                      {\n                                                                        \"Name\":\"TableFullScan\",\n                                                                        \"ReadColumns\":\n                                                                          [\n                                                                            \"hundred\",\n                                                                            \"ten\",\n                                                                            \"thousand\",\n                                                                            \"unique2\"\n                                                                          ],\n                                                                        \"ReadRange\":\n                                                                          [\n                                                                            \"unique1 (-\u221e, +\u221e)\",\n                                                                            \"unique2 (-\u221e, +\u221e)\"\n                                                                          ],\n                                                                        \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                      }\n                                                                    ],\n                                                                  \"PlanNodeId\":5,\n                                                                  \"Tables\":\n                                                                    [\n                                                                      \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          }\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":12,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"hundred\",\n                                                    \"ten\",\n                                                    \"thousand\",\n                                                    \"unique2\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"unique1 (-\u221e, +\u221e)\",\n                                                    \"unique2 (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":11,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_9.plan
index 142c4e380b4..cbb14ad0aa7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/int8_tbl\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"q1\",\n                  \"q2\"\n                ],\n              \"columns\":\n                [\n                  \"q1\",\n                  \"q2\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/int8_tbl\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"q1 (-\u221e, +\u221e)\",\n              \"q2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"q1\",\n              \"q2\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"unique1\",\n              \"unique2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.fault\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"unique1\",\n                                                                \"unique2\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"unique1 (-\u221e, +\u221e)\",\n                                                                \"unique2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"q1\",\n                                                    \"q2\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"q1 (-\u221e, +\u221e)\",\n                                                    \"q2 (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join0.test_plan\\/int8_tbl\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join0.test_plan\\/int8_tbl\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"fault (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_1.plan
index 26499b5fab1..bc9105da451 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ],\n              \"columns\":\n                [\n                  \"i\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"i (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"k\"\n                ],\n              \"columns\":\n                [\n                  \"k\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\",\n              \"j (-\u221e, +\u221e)\",\n              \"t (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"i\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"i\",\n              \"k\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"i\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"i (-\u221e, +\u221e)\",\n                                        \"j (-\u221e, +\u221e)\",\n                                        \"t (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.i)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"CTE Name\":\"tx_result_binding_2_0\",\n                              \"Node Type\":\"TopSort-InnerJoin (MapJoin)-Filter-TablePointLookup-ConstantExpr\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"InnerJoin (MapJoin)\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(item.i)\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"i\",\n                                        \"k\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                  },\n                                  {\n                                    \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                    \"Name\":\"Iterator\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"a (Asc)\",\n                            \"e (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_10.plan
index 7ee3c4c1b31..e6df12bb4a5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ],\n              \"columns\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\",\n                  \"k\"\n                ],\n              \"columns\":\n                [\n                  \"i\",\n                  \"k\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\",\n              \"j (-\u221e, +\u221e)\",\n              \"t (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"i\",\n              \"j\",\n              \"t\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\",\n              \"k (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"i\",\n              \"k\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"i\",\n                                                                \"j\",\n                                                                \"t\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"i (-\u221e, +\u221e)\",\n                                                                \"j (-\u221e, +\u221e)\",\n                                                                \"t (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"i\",\n                                                    \"k\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"i (-\u221e, +\u221e)\",\n                                                    \"k (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"i (Asc)\",\n                            \"j (Asc)\",\n                            \"t (Asc)\",\n                            \"k (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_11.plan
index 7ee3c4c1b31..809067f8625 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ],\n              \"columns\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\",\n                  \"k\"\n                ],\n              \"columns\":\n                [\n                  \"i\",\n                  \"k\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\",\n              \"j (-\u221e, +\u221e)\",\n              \"t (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"i\",\n              \"j\",\n              \"t\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\",\n              \"k (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"i\",\n              \"k\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":12,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":11,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":10,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-FullJoin (JoinDict)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"FullJoin (JoinDict)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":9,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"i\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"i\",\n                                                                \"k\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"i (-\u221e, +\u221e)\",\n                                                                \"k (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"i\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":8,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":7,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":6,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"i\",\n                                                                \"j\",\n                                                                \"t\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"i (-\u221e, +\u221e)\",\n                                                                \"j (-\u221e, +\u221e)\",\n                                                                \"t (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":5,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"i (Asc)\",\n                            \"k (Asc)\",\n                            \"t (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_12.plan
index 7ee3c4c1b31..798ac82727d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ],\n              \"columns\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\",\n                  \"k\"\n                ],\n              \"columns\":\n                [\n                  \"i\",\n                  \"k\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\",\n              \"j (-\u221e, +\u221e)\",\n              \"t (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"i\",\n              \"j\",\n              \"t\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\",\n              \"k (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"i\",\n              \"k\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":12,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":11,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":10,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-FullJoin (JoinDict)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"FullJoin (JoinDict)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":9,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"i\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"i\",\n                                                                \"k\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"i (-\u221e, +\u221e)\",\n                                                                \"k (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"i\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":8,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":7,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":6,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"i\",\n                                                                \"j\",\n                                                                \"t\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"i (-\u221e, +\u221e)\",\n                                                                \"j (-\u221e, +\u221e)\",\n                                                                \"t (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":5,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"i (Asc)\",\n                            \"k (Asc)\",\n                            \"t (Asc)\",\n                            \"j (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_13.plan
index 76345e8e44e..5cead3591fd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ],\n              \"columns\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"i (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"k\"\n                ],\n              \"columns\":\n                [\n                  \"i\",\n                  \"k\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\",\n              \"j (-\u221e, +\u221e)\",\n              \"t (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"i\",\n              \"j\",\n              \"t\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"i\",\n              \"k\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"i\",\n                                        \"j\",\n                                        \"t\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"i (-\u221e, +\u221e)\",\n                                        \"j (-\u221e, +\u221e)\",\n                                        \"t (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.i)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Filter-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"item.J2_TBL.k == 1\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_2_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.i)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TablePointLookup\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"i\",\n                                                                \"k\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                                          },\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_14.plan
index f4a87d4749d..a9f9cb49b6e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"i (\\\"1\\\")\"\n                ],\n              \"scan_by\":\n                [\n                  \"j\",\n                  \"t\"\n                ],\n              \"columns\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"i (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"k\"\n                ],\n              \"columns\":\n                [\n                  \"i\",\n                  \"k\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"i (1)\"\n            ],\n          \"scan_by\":\n            [\n              \"j (-\u221e, +\u221e)\",\n              \"t (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"i\",\n              \"j\",\n              \"t\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"i\",\n              \"k\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"i\",\n                                        \"j\",\n                                        \"t\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"i (1)\",\n                                        \"j (-\u221e, +\u221e)\",\n                                        \"t (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.i)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_2_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.i)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TablePointLookup\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"i\",\n                                                                \"k\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                                          },\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_2.plan
index a5a5b43c4a3..8f1481d5f5f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ],\n              \"columns\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"i (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"k\"\n                ],\n              \"columns\":\n                [\n                  \"k\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\",\n              \"j (-\u221e, +\u221e)\",\n              \"t (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"i\",\n              \"j\",\n              \"t\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"i\",\n              \"k\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"i\",\n                                        \"j\",\n                                        \"t\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"i (-\u221e, +\u221e)\",\n                                        \"j (-\u221e, +\u221e)\",\n                                        \"t (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.i)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"CTE Name\":\"tx_result_binding_2_0\",\n                              \"Node Type\":\"TopSort-InnerJoin (MapJoin)-Filter-TablePointLookup-ConstantExpr\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"InnerJoin (MapJoin)\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(item.i)\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"i\",\n                                        \"k\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                  },\n                                  {\n                                    \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                    \"Name\":\"Iterator\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"i (Asc)\",\n                            \"j (Asc)\",\n                            \"t (Asc)\",\n                            \"k (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_3.plan
index a5a5b43c4a3..8f1481d5f5f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ],\n              \"columns\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"i (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"k\"\n                ],\n              \"columns\":\n                [\n                  \"k\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\",\n              \"j (-\u221e, +\u221e)\",\n              \"t (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"i\",\n              \"j\",\n              \"t\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"i\",\n              \"k\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"i\",\n                                        \"j\",\n                                        \"t\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"i (-\u221e, +\u221e)\",\n                                        \"j (-\u221e, +\u221e)\",\n                                        \"t (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.i)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"CTE Name\":\"tx_result_binding_2_0\",\n                              \"Node Type\":\"TopSort-InnerJoin (MapJoin)-Filter-TablePointLookup-ConstantExpr\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"InnerJoin (MapJoin)\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(item.i)\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"i\",\n                                        \"k\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                  },\n                                  {\n                                    \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                    \"Name\":\"Iterator\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"i (Asc)\",\n                            \"j (Asc)\",\n                            \"t (Asc)\",\n                            \"k (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_4.plan
index 7ee3c4c1b31..86f0706b992 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ],\n              \"columns\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\",\n                  \"k\"\n                ],\n              \"columns\":\n                [\n                  \"i\",\n                  \"k\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\",\n              \"j (-\u221e, +\u221e)\",\n              \"t (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"i\",\n              \"j\",\n              \"t\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\",\n              \"k (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"i\",\n              \"k\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-InnerJoin (MapJoin)-Filter\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"InnerJoin (MapJoin)\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(item.j)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"i\",\n                                                                \"k\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"i (-\u221e, +\u221e)\",\n                                                                \"k (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"i\",\n                                                    \"j\",\n                                                    \"t\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"i (-\u221e, +\u221e)\",\n                                                    \"j (-\u221e, +\u221e)\",\n                                                    \"t (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"b (Asc)\",\n                            \"a (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_5.plan
index a5a5b43c4a3..3143c58b6c6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ],\n              \"columns\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"i (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"k\"\n                ],\n              \"columns\":\n                [\n                  \"k\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\",\n              \"j (-\u221e, +\u221e)\",\n              \"t (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"i\",\n              \"j\",\n              \"t\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"i\",\n              \"k\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"i\",\n                                        \"j\",\n                                        \"t\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"i (-\u221e, +\u221e)\",\n                                        \"j (-\u221e, +\u221e)\",\n                                        \"t (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.i)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"CTE Name\":\"tx_result_binding_2_0\",\n                              \"Node Type\":\"Limit-InnerJoin (MapJoin)-Filter-TablePointLookup-ConstantExpr\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"InnerJoin (MapJoin)\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(item.i)\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"i\",\n                                        \"k\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                  },\n                                  {\n                                    \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                    \"Name\":\"Iterator\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_6.plan
index c1626cacd3d..f6c768d0de3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ],\n              \"columns\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\",\n                  \"k\"\n                ],\n              \"columns\":\n                [\n                  \"k\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\",\n              \"j (-\u221e, +\u221e)\",\n              \"t (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"i\",\n              \"j\",\n              \"t\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\",\n              \"k (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"k\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-InnerJoin (MapJoin)-Filter\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.i\"\n                                  },\n                                  {\n                                    \"Name\":\"InnerJoin (MapJoin)\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(item.i)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"k\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"i (-\u221e, +\u221e)\",\n                                                                \"k (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"i\",\n                                                    \"j\",\n                                                    \"t\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"i (-\u221e, +\u221e)\",\n                                                    \"j (-\u221e, +\u221e)\",\n                                                    \"t (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"i (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_7.plan
index 76345e8e44e..b2205a27807 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ],\n              \"columns\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"i (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"k\"\n                ],\n              \"columns\":\n                [\n                  \"i\",\n                  \"k\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\",\n              \"j (-\u221e, +\u221e)\",\n              \"t (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"i\",\n              \"j\",\n              \"t\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"i\",\n              \"k\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"i\",\n                                        \"j\",\n                                        \"t\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"i (-\u221e, +\u221e)\",\n                                        \"j (-\u221e, +\u221e)\",\n                                        \"t (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.i)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_2_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.i)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TablePointLookup\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"i\",\n                                                                \"k\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                                          },\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"i (Asc)\",\n                            \"j (Asc)\",\n                            \"k (Asc)\",\n                            \"t (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_8.plan
index 76345e8e44e..b2205a27807 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ],\n              \"columns\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"i (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"k\"\n                ],\n              \"columns\":\n                [\n                  \"i\",\n                  \"k\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\",\n              \"j (-\u221e, +\u221e)\",\n              \"t (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"i\",\n              \"j\",\n              \"t\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"i\",\n              \"k\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"i\",\n                                        \"j\",\n                                        \"t\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"i (-\u221e, +\u221e)\",\n                                        \"j (-\u221e, +\u221e)\",\n                                        \"t (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.i)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_2_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.i)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TablePointLookup\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"i\",\n                                                                \"k\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                                          },\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"i (Asc)\",\n                            \"j (Asc)\",\n                            \"k (Asc)\",\n                            \"t (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_9.plan
index 7ee3c4c1b31..e6df12bb4a5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ],\n              \"columns\":\n                [\n                  \"i\",\n                  \"j\",\n                  \"t\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\",\n                  \"k\"\n                ],\n              \"columns\":\n                [\n                  \"i\",\n                  \"k\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J1_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\",\n              \"j (-\u221e, +\u221e)\",\n              \"t (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"i\",\n              \"j\",\n              \"t\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join1.test_plan\\/J2_TBL\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\",\n              \"k (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"i\",\n              \"k\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"i\",\n                                                                \"j\",\n                                                                \"t\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"i (-\u221e, +\u221e)\",\n                                                                \"j (-\u221e, +\u221e)\",\n                                                                \"t (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join1.test_plan\\/J1_TBL\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"i\",\n                                                    \"k\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"i (-\u221e, +\u221e)\",\n                                                    \"k (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join1.test_plan\\/J2_TBL\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"i (Asc)\",\n                            \"j (Asc)\",\n                            \"t (Asc)\",\n                            \"k (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_1.plan
index f0c0f347dea..bf9e91a8869 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"name\",\n                  \"n\"\n                ],\n              \"columns\":\n                [\n                  \"n\",\n                  \"name\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/t2\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"name\",\n                  \"n\"\n                ],\n              \"columns\":\n                [\n                  \"n\",\n                  \"name\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/t3\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"name\",\n                  \"n\"\n                ],\n              \"columns\":\n                [\n                  \"n\",\n                  \"name\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"name (-\u221e, +\u221e)\",\n              \"n (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"n\",\n              \"name\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/t2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"name (-\u221e, +\u221e)\",\n              \"n (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"n\",\n              \"name\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/t3\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"name (-\u221e, +\u221e)\",\n              \"n (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"n\",\n              \"name\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":20,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":19,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":18,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-FullJoin (JoinDict)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.name\"\n                                  },\n                                  {\n                                    \"Name\":\"FullJoin (JoinDict)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":17,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"name\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":12,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":11,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":10,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"FullJoin (JoinDict)\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"FullJoin (JoinDict)\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":9,\n                                                      \"Plans\":\n                                                        [\n                                                          {\n                                                            \"KeyColumns\":\n                                                              [\n                                                                \"name\"\n                                                              ],\n                                                            \"Node Type\":\"HashShuffle\",\n                                                            \"PlanNodeId\":8,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"Collect\",\n                                                                  \"PlanNodeId\":7,\n                                                                  \"Plans\":\n                                                                    [\n                                                                      {\n                                                                        \"Node Type\":\"UnionAll\",\n                                                                        \"PlanNodeId\":6,\n                                                                        \"PlanNodeType\":\"Connection\",\n                                                                        \"Plans\":\n                                                                          [\n                                                                            {\n                                                                              \"Node Type\":\"TableFullScan\",\n                                                                              \"Operators\":\n                                                                                [\n                                                                                  {\n                                                                                    \"Name\":\"TableFullScan\",\n                                                                                    \"ReadColumns\":\n                                                                                      [\n                                                                                        \"n\",\n                                                                                        \"name\"\n                                                                                      ],\n                                                                                    \"ReadRange\":\n                                                                                      [\n                                                                                        \"name (-\u221e, +\u221e)\",\n                                                                                        \"n (-\u221e, +\u221e)\"\n                                                                                      ],\n                                                                                    \"Table\":\"postgres_jointest\\/join2.test_plan\\/t1\"\n                                                                                  }\n                                                                                ],\n                                                                              \"PlanNodeId\":5,\n                                                                              \"Tables\":\n                                                                                [\n                                                                                  \"postgres_jointest\\/join2.test_plan\\/t1\"\n                                                                                ]\n                                                                            }\n                                                                          ]\n                                                                      }\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          },\n                                                          {\n                                                            \"KeyColumns\":\n                                                              [\n                                                                \"name\"\n                                                              ],\n                                                            \"Node Type\":\"HashShuffle\",\n                                                            \"PlanNodeId\":4,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"Collect\",\n                                                                  \"PlanNodeId\":3,\n                                                                  \"Plans\":\n                                                                    [\n                                                                      {\n                                                                        \"Node Type\":\"UnionAll\",\n                                                                        \"PlanNodeId\":2,\n                                                                        \"PlanNodeType\":\"Connection\",\n                                                                        \"Plans\":\n                                                                          [\n                                                                            {\n                                                                              \"Node Type\":\"TableFullScan\",\n                                                                              \"Operators\":\n                                                                                [\n                                                                                  {\n                                                                                    \"Name\":\"TableFullScan\",\n                                                                                    \"ReadColumns\":\n                                                                                      [\n                                                                                        \"n\",\n                                                                                        \"name\"\n                                                                                      ],\n                                                                                    \"ReadRange\":\n                                                                                      [\n                                                                                        \"name (-\u221e, +\u221e)\",\n                                                                                        \"n (-\u221e, +\u221e)\"\n                                                                                      ],\n                                                                                    \"Table\":\"postgres_jointest\\/join2.test_plan\\/t2\"\n                                                                                  }\n                                                                                ],\n                                                                              \"PlanNodeId\":1,\n                                                                              \"Tables\":\n                                                                                [\n                                                                                  \"postgres_jointest\\/join2.test_plan\\/t2\"\n                                                                                ]\n                                                                            }\n                                                                          ]\n                                                                      }\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          }\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"name\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":16,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":15,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":14,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"n\",\n                                                                \"name\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"name (-\u221e, +\u221e)\",\n                                                                \"n (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join2.test_plan\\/t3\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":13,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join2.test_plan\\/t3\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"name (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_10.plan
index 39eb04b6c54..b4c99591060 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/x\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"x1\",\n                  \"x2\"\n                ],\n              \"columns\":\n                [\n                  \"x1\",\n                  \"x2\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/y\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"y1 (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"y2\"\n                ],\n              \"columns\":\n                [\n                  \"y1\",\n                  \"y2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/x\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"x1 (-\u221e, +\u221e)\",\n              \"x2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"x1\",\n              \"x2\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"x1 (-\u221e, +\u221e)\",\n              \"x2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"x1\",\n              \"x2\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/y\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"y1\",\n              \"y2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items1)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"x1\",\n                                        \"x2\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"x1 (-\u221e, +\u221e)\",\n                                        \"x2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join2.test_plan\\/x\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join2.test_plan\\/x\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.x1)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":16,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":15,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":14,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.x1\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":13,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":12,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"LeftJoin (MapJoin)\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"LeftJoin (MapJoin)\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":11,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"Map\",\n                                                \"PlanNodeId\":10,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":9\n                                                    }\n                                                  ]\n                                              },\n                                              {\n                                                \"Node Type\":\"Broadcast\",\n                                                \"PlanNodeId\":8,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"Collect\",\n                                                      \"PlanNodeId\":7,\n                                                      \"Plans\":\n                                                        [\n                                                          {\n                                                            \"Node Type\":\"UnionAll\",\n                                                            \"PlanNodeId\":6,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"CTE Name\":\"tx_result_binding_2_0\",\n                                                                  \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                                  \"Operators\":\n                                                                    [\n                                                                      {\n                                                                        \"Name\":\"Filter\",\n                                                                        \"Predicate\":\"Exist(item.y1)\"\n                                                                      },\n                                                                      {\n                                                                        \"Name\":\"TablePointLookup\",\n                                                                        \"ReadColumns\":\n                                                                          [\n                                                                            \"y1\",\n                                                                            \"y2\"\n                                                                          ],\n                                                                        \"Table\":\"postgres_jointest\\/join2.test_plan\\/y\"\n                                                                      },\n                                                                      {\n                                                                        \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                                        \"Name\":\"Iterator\"\n                                                                      }\n                                                                    ],\n                                                                  \"PlanNodeId\":5,\n                                                                  \"Tables\":\n                                                                    [\n                                                                      \"postgres_jointest\\/join2.test_plan\\/y\"\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          }\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"x1\",\n                                                                \"x2\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"x1 (-\u221e, +\u221e)\",\n                                                                \"x2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join2.test_plan\\/x\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join2.test_plan\\/x\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"x1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_11.plan
index 39eb04b6c54..8b23db3892a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/x\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"x1\",\n                  \"x2\"\n                ],\n              \"columns\":\n                [\n                  \"x1\",\n                  \"x2\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/y\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"y1 (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"y2\"\n                ],\n              \"columns\":\n                [\n                  \"y1\",\n                  \"y2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/x\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"x1 (-\u221e, +\u221e)\",\n              \"x2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"x1\",\n              \"x2\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"x1 (-\u221e, +\u221e)\",\n              \"x2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"x1\",\n              \"x2\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/y\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"y1\",\n              \"y2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"x1\",\n                                        \"x2\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"x1 (-\u221e, +\u221e)\",\n                                        \"x2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join2.test_plan\\/x\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join2.test_plan\\/x\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.x1)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":16,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":15,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":14,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.x1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(item.y.y2)\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":13,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":12,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"LeftJoin (MapJoin)\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"LeftJoin (MapJoin)\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":11,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"Map\",\n                                                \"PlanNodeId\":10,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":9\n                                                    }\n                                                  ]\n                                              },\n                                              {\n                                                \"Node Type\":\"Broadcast\",\n                                                \"PlanNodeId\":8,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"Collect\",\n                                                      \"PlanNodeId\":7,\n                                                      \"Plans\":\n                                                        [\n                                                          {\n                                                            \"Node Type\":\"UnionAll\",\n                                                            \"PlanNodeId\":6,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"CTE Name\":\"tx_result_binding_2_0\",\n                                                                  \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                                  \"Operators\":\n                                                                    [\n                                                                      {\n                                                                        \"Name\":\"Filter\",\n                                                                        \"Predicate\":\"Exist(item.y1)\"\n                                                                      },\n                                                                      {\n                                                                        \"Name\":\"TablePointLookup\",\n                                                                        \"ReadColumns\":\n                                                                          [\n                                                                            \"y1\",\n                                                                            \"y2\"\n                                                                          ],\n                                                                        \"Table\":\"postgres_jointest\\/join2.test_plan\\/y\"\n                                                                      },\n                                                                      {\n                                                                        \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                                        \"Name\":\"Iterator\"\n                                                                      }\n                                                                    ],\n                                                                  \"PlanNodeId\":5,\n                                                                  \"Tables\":\n                                                                    [\n                                                                      \"postgres_jointest\\/join2.test_plan\\/y\"\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          }\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"x1\",\n                                                                \"x2\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"x1 (-\u221e, +\u221e)\",\n                                                                \"x2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join2.test_plan\\/x\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join2.test_plan\\/x\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"x1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_12.plan
index 39eb04b6c54..45ae3bcc8b2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/x\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"x1\",\n                  \"x2\"\n                ],\n              \"columns\":\n                [\n                  \"x1\",\n                  \"x2\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/y\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"y1 (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"y2\"\n                ],\n              \"columns\":\n                [\n                  \"y1\",\n                  \"y2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/x\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"x1 (-\u221e, +\u221e)\",\n              \"x2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"x1\",\n              \"x2\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"x1 (-\u221e, +\u221e)\",\n              \"x2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"x1\",\n              \"x2\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/y\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"y1\",\n              \"y2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"x1\",\n                                        \"x2\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"x1 (-\u221e, +\u221e)\",\n                                        \"x2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join2.test_plan\\/x\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join2.test_plan\\/x\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.x1)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":16,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":15,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":14,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.x1\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":13,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":12,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"LeftJoin (MapJoin)\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"LeftJoin (MapJoin)\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":11,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"Map\",\n                                                \"PlanNodeId\":10,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":9\n                                                    }\n                                                  ]\n                                              },\n                                              {\n                                                \"Node Type\":\"Broadcast\",\n                                                \"PlanNodeId\":8,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"Collect\",\n                                                      \"PlanNodeId\":7,\n                                                      \"Plans\":\n                                                        [\n                                                          {\n                                                            \"Node Type\":\"UnionAll\",\n                                                            \"PlanNodeId\":6,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"CTE Name\":\"tx_result_binding_2_0\",\n                                                                  \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                                  \"Operators\":\n                                                                    [\n                                                                      {\n                                                                        \"Name\":\"Filter\",\n                                                                        \"Predicate\":\"Exist(item.y1)\"\n                                                                      },\n                                                                      {\n                                                                        \"Name\":\"TablePointLookup\",\n                                                                        \"ReadColumns\":\n                                                                          [\n                                                                            \"y1\",\n                                                                            \"y2\"\n                                                                          ],\n                                                                        \"Table\":\"postgres_jointest\\/join2.test_plan\\/y\"\n                                                                      },\n                                                                      {\n                                                                        \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                                        \"Name\":\"Iterator\"\n                                                                      }\n                                                                    ],\n                                                                  \"PlanNodeId\":5,\n                                                                  \"Tables\":\n                                                                    [\n                                                                      \"postgres_jointest\\/join2.test_plan\\/y\"\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          }\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"x1\",\n                                                                \"x2\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"x1 (-\u221e, +\u221e)\",\n                                                                \"x2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join2.test_plan\\/x\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join2.test_plan\\/x\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"x1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_2.plan
index 0f218feba49..f5d50f01d96 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/t2\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"name\",\n                  \"n\"\n                ],\n              \"columns\":\n                [\n                  \"n\",\n                  \"name\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/t3\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"name (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"n\"\n                ],\n              \"columns\":\n                [\n                  \"n\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/t2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"name (-\u221e, +\u221e)\",\n              \"n (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"n\",\n              \"name\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/t3\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"n\",\n              \"name\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"n\",\n                                        \"name\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"name (-\u221e, +\u221e)\",\n                                        \"n (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join2.test_plan\\/t2\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join2.test_plan\\/t2\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.name)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"CTE Name\":\"tx_result_binding_2_0\",\n                              \"Node Type\":\"TopSort-InnerJoin (MapJoin)-Filter-TablePointLookup-ConstantExpr\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.name\"\n                                  },\n                                  {\n                                    \"Name\":\"InnerJoin (MapJoin)\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(item.name)\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"n\",\n                                        \"name\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join2.test_plan\\/t3\"\n                                  },\n                                  {\n                                    \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                    \"Name\":\"Iterator\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join2.test_plan\\/t3\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"name (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_3.plan
index fb2be90e0b8..015d8220130 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/t2\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"name\",\n                  \"n\"\n                ],\n              \"columns\":\n                [\n                  \"n\",\n                  \"name\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/t3\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"name (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"n\"\n                ],\n              \"columns\":\n                [\n                  \"n\",\n                  \"name\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/t2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"name (-\u221e, +\u221e)\",\n              \"n (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"n\",\n              \"name\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/t3\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"n\",\n              \"name\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"n\",\n                                        \"name\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"name (-\u221e, +\u221e)\",\n                                        \"n (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join2.test_plan\\/t2\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join2.test_plan\\/t2\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.name)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.name\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_2_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.name)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TablePointLookup\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"n\",\n                                                                \"name\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join2.test_plan\\/t3\"\n                                                          },\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join2.test_plan\\/t3\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"name (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_4.plan
index b6b3b8c0c7c..6b1e4e8620f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/t2\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"name\",\n                  \"n\"\n                ],\n              \"columns\":\n                [\n                  \"n\",\n                  \"name\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/t3\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"name\",\n                  \"n\"\n                ],\n              \"columns\":\n                [\n                  \"n\",\n                  \"name\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/t2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"name (-\u221e, +\u221e)\",\n              \"n (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"n\",\n              \"name\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/t3\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"name (-\u221e, +\u221e)\",\n              \"n (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"n\",\n              \"name\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":12,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":11,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":10,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-FullJoin (JoinDict)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.name\"\n                                  },\n                                  {\n                                    \"Name\":\"FullJoin (JoinDict)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":9,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"name\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"n\",\n                                                                \"name\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"name (-\u221e, +\u221e)\",\n                                                                \"n (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join2.test_plan\\/t3\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join2.test_plan\\/t3\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"name\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":8,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":7,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":6,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"n\",\n                                                                \"name\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"name (-\u221e, +\u221e)\",\n                                                                \"n (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join2.test_plan\\/t2\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":5,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join2.test_plan\\/t2\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"name (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_5.plan
index db77232d916..f7b61f584ad 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/x\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"x1\",\n                  \"x2\"\n                ],\n              \"limit\":\"\\\"1001\\\"\",\n              \"columns\":\n                [\n                  \"x1\",\n                  \"x2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/x\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"x1 (-\u221e, +\u221e)\",\n              \"x2 (-\u221e, +\u221e)\"\n            ],\n          \"limit\":\"1001\",\n          \"columns\":\n            [\n              \"x1\",\n              \"x2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"x1\",\n                                        \"x2\"\n                                      ],\n                                    \"ReadLimit\":\"1001\",\n                                    \"ReadRange\":\n                                      [\n                                        \"x1 (-\u221e, +\u221e)\",\n                                        \"x2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join2.test_plan\\/x\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join2.test_plan\\/x\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"x1 (Asc)\",\n                            \"x2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_6.plan
index 4457906f41a..6d211caf976 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/y\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"y1\",\n                  \"y2\"\n                ],\n              \"limit\":\"\\\"1001\\\"\",\n              \"columns\":\n                [\n                  \"y1\",\n                  \"y2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/y\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"y1 (-\u221e, +\u221e)\",\n              \"y2 (-\u221e, +\u221e)\"\n            ],\n          \"limit\":\"1001\",\n          \"columns\":\n            [\n              \"y1\",\n              \"y2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"y1\",\n                                        \"y2\"\n                                      ],\n                                    \"ReadLimit\":\"1001\",\n                                    \"ReadRange\":\n                                      [\n                                        \"y1 (-\u221e, +\u221e)\",\n                                        \"y2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join2.test_plan\\/y\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join2.test_plan\\/y\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"y1 (Asc)\",\n                            \"y2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_7.plan
index 39eb04b6c54..0b37afaa0da 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/x\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"x1\",\n                  \"x2\"\n                ],\n              \"columns\":\n                [\n                  \"x1\",\n                  \"x2\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/y\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"y1 (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"y2\"\n                ],\n              \"columns\":\n                [\n                  \"y1\",\n                  \"y2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/x\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"x1 (-\u221e, +\u221e)\",\n              \"x2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"x1\",\n              \"x2\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/y\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"y1\",\n              \"y2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items1)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"x1\",\n                                        \"x2\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"x1 (-\u221e, +\u221e)\",\n                                        \"x2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join2.test_plan\\/x\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join2.test_plan\\/x\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.x1)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_2_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.y1)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TablePointLookup\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"y1\",\n                                                                \"y2\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join2.test_plan\\/y\"\n                                                          },\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join2.test_plan\\/y\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_8.plan
index 39eb04b6c54..5cea023dd09 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/x\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"x1\",\n                  \"x2\"\n                ],\n              \"columns\":\n                [\n                  \"x1\",\n                  \"x2\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/y\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"y1 (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"y2\"\n                ],\n              \"columns\":\n                [\n                  \"y1\",\n                  \"y2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/x\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"x1 (-\u221e, +\u221e)\",\n              \"x2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"x1\",\n              \"x2\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/y\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"y1\",\n              \"y2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"x1\",\n                                        \"x2\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"x1 (-\u221e, +\u221e)\",\n                                        \"x2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join2.test_plan\\/x\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join2.test_plan\\/x\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.x1)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Filter-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(item.y.y2)\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_2_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.y1)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TablePointLookup\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"y1\",\n                                                                \"y2\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join2.test_plan\\/y\"\n                                                          },\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join2.test_plan\\/y\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_9.plan
index 39eb04b6c54..45ae3bcc8b2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/x\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"x1\",\n                  \"x2\"\n                ],\n              \"columns\":\n                [\n                  \"x1\",\n                  \"x2\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/y\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"y1 (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"y2\"\n                ],\n              \"columns\":\n                [\n                  \"y1\",\n                  \"y2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/x\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"x1 (-\u221e, +\u221e)\",\n              \"x2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"x1\",\n              \"x2\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"x1 (-\u221e, +\u221e)\",\n              \"x2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"x1\",\n              \"x2\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join2.test_plan\\/y\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"y1\",\n              \"y2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"x1\",\n                                        \"x2\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"x1 (-\u221e, +\u221e)\",\n                                        \"x2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join2.test_plan\\/x\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join2.test_plan\\/x\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.x1)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":16,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":15,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":14,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.x1\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":13,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":12,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"LeftJoin (MapJoin)\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"LeftJoin (MapJoin)\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":11,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"Map\",\n                                                \"PlanNodeId\":10,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":9\n                                                    }\n                                                  ]\n                                              },\n                                              {\n                                                \"Node Type\":\"Broadcast\",\n                                                \"PlanNodeId\":8,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"Collect\",\n                                                      \"PlanNodeId\":7,\n                                                      \"Plans\":\n                                                        [\n                                                          {\n                                                            \"Node Type\":\"UnionAll\",\n                                                            \"PlanNodeId\":6,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"CTE Name\":\"tx_result_binding_2_0\",\n                                                                  \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                                  \"Operators\":\n                                                                    [\n                                                                      {\n                                                                        \"Name\":\"Filter\",\n                                                                        \"Predicate\":\"Exist(item.y1)\"\n                                                                      },\n                                                                      {\n                                                                        \"Name\":\"TablePointLookup\",\n                                                                        \"ReadColumns\":\n                                                                          [\n                                                                            \"y1\",\n                                                                            \"y2\"\n                                                                          ],\n                                                                        \"Table\":\"postgres_jointest\\/join2.test_plan\\/y\"\n                                                                      },\n                                                                      {\n                                                                        \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                                        \"Name\":\"Iterator\"\n                                                                      }\n                                                                    ],\n                                                                  \"PlanNodeId\":5,\n                                                                  \"Tables\":\n                                                                    [\n                                                                      \"postgres_jointest\\/join2.test_plan\\/y\"\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          }\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"x1\",\n                                                                \"x2\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"x1 (-\u221e, +\u221e)\",\n                                                                \"x2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join2.test_plan\\/x\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join2.test_plan\\/x\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"x1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_1.plan
index ea1413dc4c0..0781e6de06d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/int8_tbl\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"q1\",\n                  \"q2\"\n                ],\n              \"columns\":\n                [\n                  \"q1\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"q1\",\n                  \"q2\"\n                ],\n              \"columns\":\n                [\n                  \"q2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/int8_tbl\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"q1 (-\u221e, +\u221e)\",\n              \"q2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"q1\",\n              \"q2\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"q1 (-\u221e, +\u221e)\",\n              \"q2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"q1\",\n              \"q2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"item.b.q1 \\u003E 0\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"q1\",\n                                                                \"q2\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"q1 (-\u221e, +\u221e)\",\n                                                                \"q2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join3.test_plan\\/int8_tbl\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join3.test_plan\\/int8_tbl\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"q1\",\n                                                    \"q2\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"q1 (-\u221e, +\u221e)\",\n                                                    \"q2 (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join3.test_plan\\/int8_tbl\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join3.test_plan\\/int8_tbl\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"q2 (Asc)\",\n                            \"q1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_2.plan
index 28dbbe049e8..6b5aa29002b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/child\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"k (expr)\"\n                ],\n              \"columns\":\n                [\n                  \"k\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/parent\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"k\"\n                ],\n              \"columns\":\n                [\n                  \"k\",\n                  \"pd\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/child\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"k\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/parent\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"k (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"k\",\n              \"pd\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"k\",\n                                        \"pd\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"k (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join3.test_plan\\/parent\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join3.test_plan\\/parent\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.k)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.k\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_2_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.k)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TablePointLookup\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"k\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join3.test_plan\\/child\"\n                                                          },\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join3.test_plan\\/child\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"k (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_3.plan
index 4352fc4cf85..63cfa55687b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/child\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"k\"\n                ],\n              \"columns\":\n                [\n                  \"k\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/parent\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"k\"\n                ],\n              \"columns\":\n                [\n                  \"k\",\n                  \"pd\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/child\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"k (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"k\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/parent\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"k (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"k\",\n              \"pd\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.k\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"k\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"k (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join3.test_plan\\/child\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join3.test_plan\\/child\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"k\",\n                                                    \"pd\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"k (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join3.test_plan\\/parent\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join3.test_plan\\/parent\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"k (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_4.plan
index f6868e6dc86..2a7ee111c3c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/child\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"k (expr)\"\n                ],\n              \"columns\":\n                [\n                  \"k\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/parent\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Scan\",\n              \"scan_by\":\n                [\n                  \"k [\\\"2\\\", \\\"1\\\"]\"\n                ],\n              \"columns\":\n                [\n                  \"k\",\n                  \"pd\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/child\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"k\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/parent\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Scan\",\n          \"scan_by\":\n            [\n              \"k [2, 1]\"\n            ],\n          \"columns\":\n            [\n              \"k\",\n              \"pd\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableRangeScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableRangeScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"k\",\n                                        \"pd\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"k [2, 1]\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join3.test_plan\\/parent\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join3.test_plan\\/parent\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.k)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_2_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.k)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TablePointLookup\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"k\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join3.test_plan\\/child\"\n                                                          },\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join3.test_plan\\/child\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_5.plan
index 40113a67247..fd50c667d29 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/child\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"k (expr)\"\n                ],\n              \"columns\":\n                [\n                  \"k\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/parent\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Scan\",\n              \"scan_by\":\n                [\n                  \"k [\\\"2\\\", \\\"1\\\"]\"\n                ],\n              \"columns\":\n                [\n                  \"k\",\n                  \"pd\"\n                ]\n            },\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"k (expr)\"\n                ],\n              \"columns\":\n                [\n                  \"k\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/child\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"k\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/parent\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Scan\",\n          \"scan_by\":\n            [\n              \"k [2, 1]\"\n            ],\n          \"columns\":\n            [\n              \"k\",\n              \"pd\"\n            ]\n        },\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"k\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableRangeScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableRangeScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"k\",\n                                        \"pd\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"k [2, 1]\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join3.test_plan\\/parent\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join3.test_plan\\/parent\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.k)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_2_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":10,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_2_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.k)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TablePointLookup\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"k\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join3.test_plan\\/child\"\n                                                          },\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join3.test_plan\\/child\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_2_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_3_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.p_1.k)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_3_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_4_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"CTE Name\":\"tx_result_binding_4_0\",\n                              \"Node Type\":\"Limit-InnerJoin (MapJoin)-Filter-TablePointLookup-ConstantExpr\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"InnerJoin (MapJoin)\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(item.k)\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"k\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join3.test_plan\\/parent\"\n                                  },\n                                  {\n                                    \"Iterator\":\"%kqp%tx_result_binding_3_0\",\n                                    \"Name\":\"Iterator\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join3.test_plan\\/parent\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_6.plan
index 1e1b6190a22..68918d335c2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/qa\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"id (expr)\"\n                ],\n              \"columns\":\n                [\n                  \"id\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/qb\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"id\"\n                ],\n              \"columns\":\n                [\n                  \"a_id\",\n                  \"id\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/qa\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"id\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/qb\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"id (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a_id\",\n              \"id\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a_id\",\n                                        \"id\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"id (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join3.test_plan\\/qb\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join3.test_plan\\/qb\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.a_id)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Filter-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Not Or item.qa.id \\u003E 0\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_2_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.id)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TablePointLookup\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"id\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join3.test_plan\\/qa\"\n                                                          },\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join3.test_plan\\/qa\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_7.plan
index 1e1b6190a22..68918d335c2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/qa\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"id (expr)\"\n                ],\n              \"columns\":\n                [\n                  \"id\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/qb\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"id\"\n                ],\n              \"columns\":\n                [\n                  \"a_id\",\n                  \"id\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/qa\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"id\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/qb\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"id (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a_id\",\n              \"id\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a_id\",\n                                        \"id\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"id (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join3.test_plan\\/qb\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join3.test_plan\\/qb\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.a_id)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Filter-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Not Or item.qa.id \\u003E 0\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_2_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.id)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TablePointLookup\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"id\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join3.test_plan\\/qa\"\n                                                          },\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join3.test_plan\\/qa\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_8.plan
index 88b0ee7348d..0bda82e4689 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/int8_tbl\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"q1\",\n                  \"q2\"\n                ],\n              \"columns\":\n                [\n                  \"q1\",\n                  \"q2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join3.test_plan\\/int8_tbl\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"q1 (-\u221e, +\u221e)\",\n              \"q2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"q1\",\n              \"q2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"LeftJoin (MapJoin)-TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"LeftJoin (MapJoin)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"q1\",\n                                                                \"q2\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"q1 (-\u221e, +\u221e)\",\n                                                                \"q2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join3.test_plan\\/int8_tbl\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join3.test_plan\\/int8_tbl\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"[{x: 1}]\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"x (Asc)\",\n                            \"q1 (Asc)\",\n                            \"q2 (Asc)\",\n                            \"y (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_1.plan
index b5f20f12685..c1e2e9e6d9b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/nt1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"id\"\n                ],\n              \"columns\":\n                [\n                  \"a1\",\n                  \"a2\",\n                  \"id\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/nt2\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"id\"\n                ],\n              \"columns\":\n                [\n                  \"b1\",\n                  \"b2\",\n                  \"id\",\n                  \"nt1_id\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/nt3\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"id (\\\"1\\\")\"\n                ],\n              \"columns\":\n                [\n                  \"id\",\n                  \"nt2_id\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/nt1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"id (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a1\",\n              \"a2\",\n              \"id\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/nt2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"id (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b1\",\n              \"b2\",\n              \"id\",\n              \"nt1_id\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/nt3\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"id\",\n              \"nt2_id\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":16,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":15,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":14,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Filter-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"{b1: FilterNullMembers.nt2.b1,b2: FilterNullMembers.nt2.b2,b3: FilterNullMembers.nt2.b1 And {a1: FilterNullMembers.a1,a2: FilterNullMembers.a2,a3: Exist(FilterNullMembers.id),id: FilterNullMembers.id}.a3,id: FilterNullMembers.nt2.id,nt1_id: FilterNullMembers.nt2.nt1_id}.b3\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":13,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":10,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":9,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":8,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"LeftJoin (MapJoin)\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"LeftJoin (MapJoin)\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":7,\n                                                      \"Plans\":\n                                                        [\n                                                          {\n                                                            \"Node Type\":\"Broadcast\",\n                                                            \"PlanNodeId\":4,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"Collect\",\n                                                                  \"PlanNodeId\":3,\n                                                                  \"Plans\":\n                                                                    [\n                                                                      {\n                                                                        \"Node Type\":\"UnionAll\",\n                                                                        \"PlanNodeId\":2,\n                                                                        \"PlanNodeType\":\"Connection\",\n                                                                        \"Plans\":\n                                                                          [\n                                                                            {\n                                                                              \"Node Type\":\"TableFullScan\",\n                                                                              \"Operators\":\n                                                                                [\n                                                                                  {\n                                                                                    \"Name\":\"TableFullScan\",\n                                                                                    \"ReadColumns\":\n                                                                                      [\n                                                                                        \"a1\",\n                                                                                        \"a2\",\n                                                                                        \"id\"\n                                                                                      ],\n                                                                                    \"ReadRange\":\n                                                                                      [\n                                                                                        \"id (-\u221e, +\u221e)\"\n                                                                                      ],\n                                                                                    \"Table\":\"postgres_jointest\\/join4.test_plan\\/nt1\"\n                                                                                  }\n                                                                                ],\n                                                                              \"PlanNodeId\":1,\n                                                                              \"Tables\":\n                                                                                [\n                                                                                  \"postgres_jointest\\/join4.test_plan\\/nt1\"\n                                                                                ]\n                                                                            }\n                                                                          ]\n                                                                      }\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          },\n                                                          {\n                                                            \"Node Type\":\"Map\",\n                                                            \"PlanNodeId\":6,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"TableFullScan\",\n                                                                  \"Operators\":\n                                                                    [\n                                                                      {\n                                                                        \"Name\":\"TableFullScan\",\n                                                                        \"ReadColumns\":\n                                                                          [\n                                                                            \"b1\",\n                                                                            \"b2\",\n                                                                            \"id\",\n                                                                            \"nt1_id\"\n                                                                          ],\n                                                                        \"ReadRange\":\n                                                                          [\n                                                                            \"id (-\u221e, +\u221e)\"\n                                                                          ],\n                                                                        \"Table\":\"postgres_jointest\\/join4.test_plan\\/nt2\"\n                                                                      }\n                                                                    ],\n                                                                  \"PlanNodeId\":5,\n                                                                  \"Tables\":\n                                                                    [\n                                                                      \"postgres_jointest\\/join4.test_plan\\/nt2\"\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          }\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":12,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TablePointLookup-ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TablePointLookup\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"id\",\n                                                    \"nt2_id\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join4.test_plan\\/nt3\"\n                                              },\n                                              {\n                                                \"Iterator\":\"[{id: 1}]\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":11,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join4.test_plan\\/nt3\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_10.plan
index 36b93642304..5cba652f91a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/qrt3\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"x\",\n                  \"y\"\n                ],\n              \"limit\":\"\\\"1001\\\"\",\n              \"columns\":\n                [\n                  \"x\",\n                  \"y\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/qrt3\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"x (-\u221e, +\u221e)\",\n              \"y (-\u221e, +\u221e)\"\n            ],\n          \"limit\":\"1001\",\n          \"columns\":\n            [\n              \"x\",\n              \"y\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"x\",\n                                        \"y\"\n                                      ],\n                                    \"ReadLimit\":\"1001\",\n                                    \"ReadRange\":\n                                      [\n                                        \"x (-\u221e, +\u221e)\",\n                                        \"y (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join4.test_plan\\/qrt3\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join4.test_plan\\/qrt3\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_11.plan
index 36b93642304..5cba652f91a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/qrt3\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"x\",\n                  \"y\"\n                ],\n              \"limit\":\"\\\"1001\\\"\",\n              \"columns\":\n                [\n                  \"x\",\n                  \"y\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/qrt3\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"x (-\u221e, +\u221e)\",\n              \"y (-\u221e, +\u221e)\"\n            ],\n          \"limit\":\"1001\",\n          \"columns\":\n            [\n              \"x\",\n              \"y\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"x\",\n                                        \"y\"\n                                      ],\n                                    \"ReadLimit\":\"1001\",\n                                    \"ReadRange\":\n                                      [\n                                        \"x (-\u221e, +\u221e)\",\n                                        \"y (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join4.test_plan\\/qrt3\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join4.test_plan\\/qrt3\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_12.plan
index 36b93642304..5cba652f91a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/qrt3\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"x\",\n                  \"y\"\n                ],\n              \"limit\":\"\\\"1001\\\"\",\n              \"columns\":\n                [\n                  \"x\",\n                  \"y\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/qrt3\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"x (-\u221e, +\u221e)\",\n              \"y (-\u221e, +\u221e)\"\n            ],\n          \"limit\":\"1001\",\n          \"columns\":\n            [\n              \"x\",\n              \"y\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"x\",\n                                        \"y\"\n                                      ],\n                                    \"ReadLimit\":\"1001\",\n                                    \"ReadRange\":\n                                      [\n                                        \"x (-\u221e, +\u221e)\",\n                                        \"y (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join4.test_plan\\/qrt3\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join4.test_plan\\/qrt3\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_13.plan
index bba4185fa65..6ef8d6697b0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/qrt1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/qrt2\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/qrt1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/qrt2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join4.test_plan\\/qrt1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join4.test_plan\\/qrt1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.a)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_2_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.a)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TablePointLookup\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"a\",\n                                                                \"b\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join4.test_plan\\/qrt2\"\n                                                          },\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join4.test_plan\\/qrt2\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"a1 (Asc)\",\n                            \"b2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_2.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_3.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_4.plan
index d724fcaad35..91ea5490c6a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/a\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"code\"\n                ],\n              \"columns\":\n                [\n                  \"code\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/b\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"num\"\n                ],\n              \"columns\":\n                [\n                  \"a\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/c\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"name\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"name\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/a\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"code (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"code\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/b\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"num (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/c\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"name (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"name\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":18,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":17,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":16,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.name\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":15,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":12,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":11,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":10,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"LeftJoin (MapJoin)\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"LeftJoin (MapJoin)\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":9,\n                                                      \"Plans\":\n                                                        [\n                                                          {\n                                                            \"Node Type\":\"Broadcast\",\n                                                            \"PlanNodeId\":6,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"Collect\",\n                                                                  \"PlanNodeId\":5,\n                                                                  \"Plans\":\n                                                                    [\n                                                                      {\n                                                                        \"Node Type\":\"UnionAll\",\n                                                                        \"PlanNodeId\":4,\n                                                                        \"PlanNodeType\":\"Connection\",\n                                                                        \"Plans\":\n                                                                          [\n                                                                            {\n                                                                              \"Node Type\":\"Aggregate\",\n                                                                              \"Operators\":\n                                                                                [\n                                                                                  {\n                                                                                    \"Name\":\"Aggregate\"\n                                                                                  }\n                                                                                ],\n                                                                              \"PlanNodeId\":3,\n                                                                              \"Plans\":\n                                                                                [\n                                                                                  {\n                                                                                    \"KeyColumns\":\n                                                                                      [\n                                                                                        \"a\"\n                                                                                      ],\n                                                                                    \"Node Type\":\"HashShuffle\",\n                                                                                    \"PlanNodeId\":2,\n                                                                                    \"PlanNodeType\":\"Connection\",\n                                                                                    \"Plans\":\n                                                                                      [\n                                                                                        {\n                                                                                          \"Node Type\":\"TableFullScan\",\n                                                                                          \"Operators\":\n                                                                                            [\n                                                                                              {\n                                                                                                \"Name\":\"TableFullScan\",\n                                                                                                \"ReadColumns\":\n                                                                                                  [\n                                                                                                    \"a\"\n                                                                                                  ],\n                                                                                                \"ReadRange\":\n                                                                                                  [\n                                                                                                    \"a (-\u221e, +\u221e)\",\n                                                                                                    \"num (-\u221e, +\u221e)\"\n                                                                                                  ],\n                                                                                                \"Table\":\"postgres_jointest\\/join4.test_plan\\/b\"\n                                                                                              }\n                                                                                            ],\n                                                                                          \"PlanNodeId\":1,\n                                                                                          \"Tables\":\n                                                                                            [\n                                                                                              \"postgres_jointest\\/join4.test_plan\\/b\"\n                                                                                            ]\n                                                                                        }\n                                                                                      ]\n                                                                                  }\n                                                                                ]\n                                                                            }\n                                                                          ]\n                                                                      }\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          },\n                                                          {\n                                                            \"Node Type\":\"Map\",\n                                                            \"PlanNodeId\":8,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"TableFullScan\",\n                                                                  \"Operators\":\n                                                                    [\n                                                                      {\n                                                                        \"Name\":\"TableFullScan\",\n                                                                        \"ReadColumns\":\n                                                                          [\n                                                                            \"code\"\n                                                                          ],\n                                                                        \"ReadRange\":\n                                                                          [\n                                                                            \"code (-\u221e, +\u221e)\"\n                                                                          ],\n                                                                        \"Table\":\"postgres_jointest\\/join4.test_plan\\/a\"\n                                                                      }\n                                                                    ],\n                                                                  \"PlanNodeId\":7,\n                                                                  \"Tables\":\n                                                                    [\n                                                                      \"postgres_jointest\\/join4.test_plan\\/a\"\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          }\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":14,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"name\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"name (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join4.test_plan\\/c\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":13,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join4.test_plan\\/c\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"name (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_5.plan
index 85a02fd4f5b..62375dd58f4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/tqa\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"i\"\n                ],\n              \"columns\":\n                [\n                  \"i\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/tqb\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"x\",\n                  \"y\"\n                ],\n              \"columns\":\n                [\n                  \"x\",\n                  \"y\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/tqa\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"i (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"i\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/tqb\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"x\",\n              \"y\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"i\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"i (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join4.test_plan\\/tqa\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join4.test_plan\\/tqa\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"... And Exist(item.i)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_2_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.x) And Exist(item.y)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TablePointLookup\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"x\",\n                                                                \"y\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join4.test_plan\\/tqb\"\n                                                          },\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join4.test_plan\\/tqb\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_6.plan
index 97c53fbcf8a..617184f0fc9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/zt1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"f1 (expr)\"\n                ],\n              \"columns\":\n                [\n                  \"f1\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/zt2\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"f2 (\\\"53\\\")\"\n                ],\n              \"columns\":\n                [\n                  \"f2\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/zt3\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"f3 (expr)\"\n                ],\n              \"columns\":\n                [\n                  \"f3\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/zt1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"f1\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/zt2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"f2\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/zt3\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"f3\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TablePointLookup-ConstantExpr\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"f2\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join4.test_plan\\/zt2\"\n                                  },\n                                  {\n                                    \"Iterator\":\"[{f2: 53}]\",\n                                    \"Name\":\"Iterator\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join4.test_plan\\/zt2\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.f2)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_2_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":10,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_2_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_2_0\",\n                                                      \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.f3)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TablePointLookup\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"f3\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join4.test_plan\\/zt3\"\n                                                          },\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join4.test_plan\\/zt3\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_2_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_3_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.zt3.f3)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_3_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_4_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_4_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_2_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"CTE Name\":\"tx_result_binding_4_0\",\n                                                      \"Node Type\":\"Filter-TablePointLookup-ConstantExpr\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.f1)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TablePointLookup\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"f1\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join4.test_plan\\/zt1\"\n                                                          },\n                                                          {\n                                                            \"Iterator\":\"%kqp%tx_result_binding_3_0\",\n                                                            \"Name\":\"Iterator\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join4.test_plan\\/zt1\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_7.plan
index 6c19cbf9fe5..1d100ad7800 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/tt5\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"f1\",\n                  \"f2\"\n                ],\n              \"columns\":\n                [\n                  \"f1\",\n                  \"f2\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/tt6\",\n        \"reads\":\n          [\n            {\n              \"type\":\"MultiLookup\",\n              \"lookup_by\":\n                [\n                  \"f1 (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"f2\"\n                ],\n              \"columns\":\n                [\n                  \"f1\",\n                  \"f2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/tt5\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"f1 (-\u221e, +\u221e)\",\n              \"f2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"f1\",\n              \"f2\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/tt6\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"columns\":\n            [\n              \"f1\",\n              \"f2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Collect\",\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"f1\",\n                                        \"f2\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"f1 (-\u221e, +\u221e)\",\n                                        \"f2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join4.test_plan\\/tt5\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join4.test_plan\\/tt5\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_1_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":2,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Filter-Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Filter\",\n                        \"Predicate\":\"Exist(item.f1)\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":1\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_1_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_2_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"CTE Name\":\"tx_result_binding_2_0\",\n                              \"Node Type\":\"Filter-InnerJoin (MapJoin)-Filter-TablePointLookup-ConstantExpr\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"InnerJoin (MapJoin)\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(item.f1)\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"f1\",\n                                        \"f2\"\n                                      ],\n                                    \"Table\":\"postgres_jointest\\/join4.test_plan\\/tt6\"\n                                  },\n                                  {\n                                    \"Iterator\":\"%kqp%tx_result_binding_1_0\",\n                                    \"Name\":\"Iterator\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_jointest\\/join4.test_plan\\/tt6\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_8.plan
index 6341ca0ea07..a531b3fd3b5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/tt1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"tt1_id\",\n                  \"joincol\"\n                ],\n              \"columns\":\n                [\n                  \"joincol\",\n                  \"tt1_id\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/tt2\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"tt2_id\",\n                  \"joincol\"\n                ],\n              \"columns\":\n                [\n                  \"joincol\",\n                  \"tt2_id\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/tt1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"tt1_id (-\u221e, +\u221e)\",\n              \"joincol (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"joincol\",\n              \"tt1_id\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/tt2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"tt2_id (-\u221e, +\u221e)\",\n              \"joincol (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"joincol\",\n              \"tt2_id\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"joincol\",\n                                                                \"tt2_id\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"tt2_id (-\u221e, +\u221e)\",\n                                                                \"joincol (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join4.test_plan\\/tt2\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join4.test_plan\\/tt2\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"joincol\",\n                                                    \"tt1_id\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"tt1_id (-\u221e, +\u221e)\",\n                                                    \"joincol (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join4.test_plan\\/tt1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join4.test_plan\\/tt1\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_9.plan
index 6341ca0ea07..a531b3fd3b5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/tt1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"tt1_id\",\n                  \"joincol\"\n                ],\n              \"columns\":\n                [\n                  \"joincol\",\n                  \"tt1_id\"\n                ]\n            }\n          ]\n      },\n      {\n        \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/tt2\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"tt2_id\",\n                  \"joincol\"\n                ],\n              \"columns\":\n                [\n                  \"joincol\",\n                  \"tt2_id\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/tt1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"tt1_id (-\u221e, +\u221e)\",\n              \"joincol (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"joincol\",\n              \"tt1_id\"\n            ]\n        }\n      ]\n  },\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/tt2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"tt2_id (-\u221e, +\u221e)\",\n              \"joincol (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"joincol\",\n              \"tt2_id\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"joincol\",\n                                                                \"tt2_id\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"tt2_id (-\u221e, +\u221e)\",\n                                                                \"joincol (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join4.test_plan\\/tt2\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join4.test_plan\\/tt2\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"joincol\",\n                                                    \"tt1_id\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"tt1_id (-\u221e, +\u221e)\",\n                                                    \"joincol (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join4.test_plan\\/tt1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join4.test_plan\\/tt1\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_1.plan
index 83fce0798e9..877fe98d45a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Scan\",\n              \"scan_by\":\n                [\n                  \"unique1 [-inf, \\\"10\\\")\",\n                  \"unique2\"\n                ],\n              \"limit\":\"\\\"1001\\\"\",\n              \"columns\":\n                [\n                  \"even\",\n                  \"fivethous\",\n                  \"four\",\n                  \"hundred\",\n                  \"odd\",\n                  \"string4\",\n                  \"stringu1\",\n                  \"stringu2\",\n                  \"ten\",\n                  \"tenthous\",\n                  \"thousand\",\n                  \"twenty\",\n                  \"two\",\n                  \"twothousand\",\n                  \"unique1\",\n                  \"unique2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Scan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, 10)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"limit\":\"1001\",\n          \"columns\":\n            [\n              \"even\",\n              \"fivethous\",\n              \"four\",\n              \"hundred\",\n              \"odd\",\n              \"string4\",\n              \"stringu1\",\n              \"stringu2\",\n              \"ten\",\n              \"tenthous\",\n              \"thousand\",\n              \"twenty\",\n              \"two\",\n              \"twothousand\",\n              \"unique1\",\n              \"unique2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-TableRangeScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"TableRangeScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"even\",\n                                        \"fivethous\",\n                                        \"four\",\n                                        \"hundred\",\n                                        \"odd\",\n                                        \"string4\",\n                                        \"stringu1\",\n                                        \"stringu2\",\n                                        \"ten\",\n                                        \"tenthous\",\n                                        \"thousand\",\n                                        \"twenty\",\n                                        \"two\",\n                                        \"twothousand\",\n                                        \"unique1\",\n                                        \"unique2\"\n                                      ],\n                                    \"ReadLimit\":\"1001\",\n                                    \"ReadRange\":\n                                      [\n                                        \"unique1 (-\u221e, 10)\",\n                                        \"unique2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_select.test_plan\\/onek\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_select.test_plan\\/onek\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"unique1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_10.plan
index 3c38706b86d..14cb1af8d9d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek2\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Scan\",\n              \"scan_by\":\n                [\n                  \"unique1 (\\\"980\\\", +inf]\",\n                  \"unique2\"\n                ],\n              \"limit\":\"\\\"1001\\\"\",\n              \"columns\":\n                [\n                  \"stringu1\",\n                  \"unique1\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Scan\",\n          \"scan_by\":\n            [\n              \"unique1 (980, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"limit\":\"1001\",\n          \"columns\":\n            [\n              \"stringu1\",\n              \"unique1\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-TableRangeScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"TableRangeScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"stringu1\",\n                                        \"unique1\"\n                                      ],\n                                    \"ReadLimit\":\"1001\",\n                                    \"ReadRange\":\n                                      [\n                                        \"unique1 (980, +\u221e)\",\n                                        \"unique2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_select.test_plan\\/onek2\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_select.test_plan\\/onek2\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_11.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_12.plan
index 6d5a6afefa6..2a80e7f418b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"even\",\n                  \"fivethous\",\n                  \"four\",\n                  \"hundred\",\n                  \"odd\",\n                  \"string4\",\n                  \"stringu1\",\n                  \"stringu2\",\n                  \"ten\",\n                  \"tenthous\",\n                  \"thousand\",\n                  \"twenty\",\n                  \"two\",\n                  \"twothousand\",\n                  \"unique1\",\n                  \"unique2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"even\",\n              \"fivethous\",\n              \"four\",\n              \"hundred\",\n              \"odd\",\n              \"string4\",\n              \"stringu1\",\n              \"stringu2\",\n              \"ten\",\n              \"tenthous\",\n              \"thousand\",\n              \"twenty\",\n              \"two\",\n              \"twothousand\",\n              \"unique1\",\n              \"unique2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-InnerJoin (MapJoin)-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"InnerJoin (MapJoin)\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items6) And Exist(items14)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"even\",\n                                        \"fivethous\",\n                                        \"four\",\n                                        \"hundred\",\n                                        \"odd\",\n                                        \"string4\",\n                                        \"stringu1\",\n                                        \"stringu2\",\n                                        \"ten\",\n                                        \"tenthous\",\n                                        \"thousand\",\n                                        \"twenty\",\n                                        \"two\",\n                                        \"twothousand\",\n                                        \"unique1\",\n                                        \"unique2\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"unique1 (-\u221e, +\u221e)\",\n                                        \"unique2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_select.test_plan\\/onek\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_select.test_plan\\/onek\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_13.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_14.plan
index c45cbe4d69c..0898a8336e9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select.test_plan\\/int8_tbl\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"q1\",\n                  \"q2\"\n                ],\n              \"columns\":\n                [\n                  \"q1\",\n                  \"q2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select.test_plan\\/int8_tbl\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"q1 (-\u221e, +\u221e)\",\n              \"q2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"q1\",\n              \"q2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Merge\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Sort-Union\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Sort\",\n                                                \"SortBy\":\"\"\n                                              },\n                                              {\n                                                \"Name\":\"Union\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":4,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"Limit\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Limit\":\"1001\",\n                                                            \"Name\":\"Limit\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":3,\n                                                      \"Plans\":\n                                                        [\n                                                          {\n                                                            \"Node Type\":\"Merge\",\n                                                            \"PlanNodeId\":2,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"TopSort-TableFullScan\",\n                                                                  \"Operators\":\n                                                                    [\n                                                                      {\n                                                                        \"Limit\":\"1001\",\n                                                                        \"Name\":\"TopSort\",\n                                                                        \"TopSortBy\":\"\"\n                                                                      },\n                                                                      {\n                                                                        \"Name\":\"TableFullScan\",\n                                                                        \"ReadColumns\":\n                                                                          [\n                                                                            \"q1\",\n                                                                            \"q2\"\n                                                                          ],\n                                                                        \"ReadRange\":\n                                                                          [\n                                                                            \"q1 (-\u221e, +\u221e)\",\n                                                                            \"q2 (-\u221e, +\u221e)\"\n                                                                          ],\n                                                                        \"Table\":\"postgres_select.test_plan\\/int8_tbl\"\n                                                                      }\n                                                                    ],\n                                                                  \"PlanNodeId\":1,\n                                                                  \"Tables\":\n                                                                    [\n                                                                      \"postgres_select.test_plan\\/int8_tbl\"\n                                                                    ]\n                                                                }\n                                                              ],\n                                                            \"SortColumns\":\n                                                              [\n                                                                \"column0 (Asc)\",\n                                                                \"column1 (Asc)\"\n                                                              ]\n                                                          }\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ],\n                                    \"SortColumns\":\n                                      [\n                                        \"column0 (Asc)\",\n                                        \"column1 (Asc)\"\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_15.plan
index 309c2e9aa44..210846d2b30 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select.test_plan\\/foo\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"f1\"\n                ],\n              \"columns\":\n                [\n                  \"f1\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select.test_plan\\/foo\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"f1 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"f1\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"f1\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"f1 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_select.test_plan\\/foo\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_select.test_plan\\/foo\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"f1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_16.plan
index 309c2e9aa44..210846d2b30 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select.test_plan\\/foo\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"f1\"\n                ],\n              \"columns\":\n                [\n                  \"f1\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select.test_plan\\/foo\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"f1 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"f1\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"f1\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"f1 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_select.test_plan\\/foo\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_select.test_plan\\/foo\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"f1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_17.plan
index 54593113a11..4906edc3a8c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select.test_plan\\/foo\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"f1\"\n                ],\n              \"reverse\":true,\n              \"columns\":\n                [\n                  \"f1\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select.test_plan\\/foo\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"f1 (-\u221e, +\u221e)\"\n            ],\n          \"reverse\":true,\n          \"columns\":\n            [\n              \"f1\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"f1\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"f1 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Reverse\":true,\n                                    \"Table\":\"postgres_select.test_plan\\/foo\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_select.test_plan\\/foo\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"f1 (Desc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_18.plan
index 4f94a11887a..10f22c404ca 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek2\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"even\",\n                  \"fivethous\",\n                  \"four\",\n                  \"hundred\",\n                  \"odd\",\n                  \"string4\",\n                  \"stringu1\",\n                  \"stringu2\",\n                  \"ten\",\n                  \"tenthous\",\n                  \"thousand\",\n                  \"twenty\",\n                  \"two\",\n                  \"twothousand\",\n                  \"unique1\",\n                  \"unique2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"even\",\n              \"fivethous\",\n              \"four\",\n              \"hundred\",\n              \"odd\",\n              \"string4\",\n              \"stringu1\",\n              \"stringu2\",\n              \"ten\",\n              \"tenthous\",\n              \"thousand\",\n              \"twenty\",\n              \"two\",\n              \"twothousand\",\n              \"unique1\",\n              \"unique2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items15 == 11 And items6 == \\\"ATAAAA\\\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"even\",\n                                        \"fivethous\",\n                                        \"four\",\n                                        \"hundred\",\n                                        \"odd\",\n                                        \"string4\",\n                                        \"stringu1\",\n                                        \"stringu2\",\n                                        \"ten\",\n                                        \"tenthous\",\n                                        \"thousand\",\n                                        \"twenty\",\n                                        \"two\",\n                                        \"twothousand\",\n                                        \"unique1\",\n                                        \"unique2\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"unique1 (-\u221e, +\u221e)\",\n                                        \"unique2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_select.test_plan\\/onek2\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_select.test_plan\\/onek2\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_19.plan
index 4c3941db9d9..29c01a8c654 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek2\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"stringu1\",\n                  \"unique2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"stringu1\",\n              \"unique2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items1 == 11 And items0 == \\\"ATAAAA\\\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"stringu1\",\n                                        \"unique2\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"unique1 (-\u221e, +\u221e)\",\n                                        \"unique2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_select.test_plan\\/onek2\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_select.test_plan\\/onek2\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_2.plan
index 554e03e08ac..5a634d80d5e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Scan\",\n              \"scan_by\":\n                [\n                  \"unique1 [-inf, \\\"20\\\")\",\n                  \"unique2\"\n                ],\n              \"limit\":\"\\\"1001\\\"\",\n              \"reverse\":true,\n              \"columns\":\n                [\n                  \"stringu1\",\n                  \"unique1\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Scan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, 20)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"limit\":\"1001\",\n          \"reverse\":true,\n          \"columns\":\n            [\n              \"stringu1\",\n              \"unique1\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-TableRangeScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"TableRangeScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"stringu1\",\n                                        \"unique1\"\n                                      ],\n                                    \"ReadLimit\":\"1001\",\n                                    \"ReadRange\":\n                                      [\n                                        \"unique1 (-\u221e, 20)\",\n                                        \"unique2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Reverse\":true,\n                                    \"Table\":\"postgres_select.test_plan\\/onek\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_select.test_plan\\/onek\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"unique1 (Desc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_20.plan
index 4f94a11887a..395801f481f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek2\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"even\",\n                  \"fivethous\",\n                  \"four\",\n                  \"hundred\",\n                  \"odd\",\n                  \"string4\",\n                  \"stringu1\",\n                  \"stringu2\",\n                  \"ten\",\n                  \"tenthous\",\n                  \"thousand\",\n                  \"twenty\",\n                  \"two\",\n                  \"twothousand\",\n                  \"unique1\",\n                  \"unique2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"even\",\n              \"fivethous\",\n              \"four\",\n              \"hundred\",\n              \"odd\",\n              \"string4\",\n              \"stringu1\",\n              \"stringu2\",\n              \"ten\",\n              \"tenthous\",\n              \"thousand\",\n              \"twenty\",\n              \"two\",\n              \"twothousand\",\n              \"unique1\",\n              \"unique2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items15 == 11 And items6 \\u003C \\\"B\\\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"even\",\n                                        \"fivethous\",\n                                        \"four\",\n                                        \"hundred\",\n                                        \"odd\",\n                                        \"string4\",\n                                        \"stringu1\",\n                                        \"stringu2\",\n                                        \"ten\",\n                                        \"tenthous\",\n                                        \"thousand\",\n                                        \"twenty\",\n                                        \"two\",\n                                        \"twothousand\",\n                                        \"unique1\",\n                                        \"unique2\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"unique1 (-\u221e, +\u221e)\",\n                                        \"unique2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_select.test_plan\\/onek2\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_select.test_plan\\/onek2\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_21.plan
index 4c3941db9d9..560f37e3de5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek2\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"stringu1\",\n                  \"unique2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"stringu1\",\n              \"unique2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items1 == 11 And items0 \\u003C \\\"B\\\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"stringu1\",\n                                        \"unique2\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"unique1 (-\u221e, +\u221e)\",\n                                        \"unique2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_select.test_plan\\/onek2\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_select.test_plan\\/onek2\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_22.plan
index 4c3941db9d9..5f475a467df 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek2\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"stringu1\",\n                  \"unique2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"stringu1\",\n              \"unique2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items1 == 11 And items0 \\u003C \\\"C\\\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"stringu1\",\n                                        \"unique2\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"unique1 (-\u221e, +\u221e)\",\n                                        \"unique2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_select.test_plan\\/onek2\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_select.test_plan\\/onek2\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_23.plan
index 4c3941db9d9..560f37e3de5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek2\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"stringu1\",\n                  \"unique2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"stringu1\",\n              \"unique2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items1 == 11 And items0 \\u003C \\\"B\\\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"stringu1\",\n                                        \"unique2\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"unique1 (-\u221e, +\u221e)\",\n                                        \"unique2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_select.test_plan\\/onek2\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_select.test_plan\\/onek2\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_24.plan
index 2b80e8da3c9..9d689933ad3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek2\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"stringu1\",\n                  \"unique1\",\n                  \"unique2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"stringu1\",\n              \"unique1\",\n              \"unique2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.unique2\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 == 11 Or items1 == 0 And items0 \\u003C \\\"B\\\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"stringu1\",\n                                        \"unique1\",\n                                        \"unique2\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"unique1 (-\u221e, +\u221e)\",\n                                        \"unique2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_select.test_plan\\/onek2\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_select.test_plan\\/onek2\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"unique2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_25.plan
index 2b80e8da3c9..f7f3f2c1f1d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek2\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"stringu1\",\n                  \"unique1\",\n                  \"unique2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"stringu1\",\n              \"unique1\",\n              \"unique2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.unique2\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 == 11 And items0 \\u003C \\\"B\\\" Or items1 == 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"stringu1\",\n                                        \"unique1\",\n                                        \"unique2\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"unique1 (-\u221e, +\u221e)\",\n                                        \"unique2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_select.test_plan\\/onek2\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_select.test_plan\\/onek2\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"unique2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_26.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_27.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_3.plan
index d6c2d158dc2..211aa7ace9f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Scan\",\n              \"scan_by\":\n                [\n                  \"unique1 (\\\"980\\\", +inf]\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"stringu1\",\n                  \"unique1\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Scan\",\n          \"scan_by\":\n            [\n              \"unique1 (980, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"stringu1\",\n              \"unique1\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableRangeScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.stringu1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableRangeScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"stringu1\",\n                                        \"unique1\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"unique1 (980, +\u221e)\",\n                                        \"unique2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_select.test_plan\\/onek\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_select.test_plan\\/onek\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"stringu1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_4.plan
index 4df46470450..94e1d0221f6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Scan\",\n              \"scan_by\":\n                [\n                  \"unique1 (\\\"980\\\", +inf]\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"string4\",\n                  \"unique1\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Scan\",\n          \"scan_by\":\n            [\n              \"unique1 (980, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"string4\",\n              \"unique1\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableRangeScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableRangeScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"string4\",\n                                        \"unique1\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"unique1 (980, +\u221e)\",\n                                        \"unique2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_select.test_plan\\/onek\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_select.test_plan\\/onek\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"string4 (Asc)\",\n                            \"unique1 (Desc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_5.plan
index 4df46470450..9d8e5699cef 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Scan\",\n              \"scan_by\":\n                [\n                  \"unique1 (\\\"980\\\", +inf]\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"string4\",\n                  \"unique1\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Scan\",\n          \"scan_by\":\n            [\n              \"unique1 (980, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"string4\",\n              \"unique1\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableRangeScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableRangeScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"string4\",\n                                        \"unique1\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"unique1 (980, +\u221e)\",\n                                        \"unique2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_select.test_plan\\/onek\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_select.test_plan\\/onek\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"string4 (Desc)\",\n                            \"unique1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_6.plan
index 1e83b64c32c..605a82d0685 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Scan\",\n              \"scan_by\":\n                [\n                  \"unique1 [-inf, \\\"20\\\")\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"string4\",\n                  \"unique1\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Scan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, 20)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"string4\",\n              \"unique1\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableRangeScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableRangeScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"string4\",\n                                        \"unique1\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"unique1 (-\u221e, 20)\",\n                                        \"unique2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_select.test_plan\\/onek\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_select.test_plan\\/onek\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"unique1 (Desc)\",\n                            \"string4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_7.plan
index 1e83b64c32c..50b9d2402a2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Scan\",\n              \"scan_by\":\n                [\n                  \"unique1 [-inf, \\\"20\\\")\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"string4\",\n                  \"unique1\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Scan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, 20)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"string4\",\n              \"unique1\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableRangeScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableRangeScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"string4\",\n                                        \"unique1\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"unique1 (-\u221e, 20)\",\n                                        \"unique2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_select.test_plan\\/onek\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_select.test_plan\\/onek\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"unique1 (Asc)\",\n                            \"string4 (Desc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_8.plan
index 8ff9aeaf3a9..80c97b8c4f7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek2\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"limit\":\"\\\"10\\\"\",\n              \"columns\":\n                [\n                  \"even\",\n                  \"fivethous\",\n                  \"four\",\n                  \"hundred\",\n                  \"odd\",\n                  \"string4\",\n                  \"stringu1\",\n                  \"stringu2\",\n                  \"ten\",\n                  \"tenthous\",\n                  \"thousand\",\n                  \"twenty\",\n                  \"two\",\n                  \"twothousand\",\n                  \"unique1\",\n                  \"unique2\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"limit\":\"10\",\n          \"columns\":\n            [\n              \"even\",\n              \"fivethous\",\n              \"four\",\n              \"hundred\",\n              \"odd\",\n              \"string4\",\n              \"stringu1\",\n              \"stringu2\",\n              \"ten\",\n              \"tenthous\",\n              \"thousand\",\n              \"twenty\",\n              \"two\",\n              \"twothousand\",\n              \"unique1\",\n              \"unique2\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"10\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"10\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"even\",\n                                        \"fivethous\",\n                                        \"four\",\n                                        \"hundred\",\n                                        \"odd\",\n                                        \"string4\",\n                                        \"stringu1\",\n                                        \"stringu2\",\n                                        \"ten\",\n                                        \"tenthous\",\n                                        \"thousand\",\n                                        \"twenty\",\n                                        \"two\",\n                                        \"twothousand\",\n                                        \"unique1\",\n                                        \"unique2\"\n                                      ],\n                                    \"ReadLimit\":\"10\",\n                                    \"ReadRange\":\n                                      [\n                                        \"unique1 (-\u221e, +\u221e)\",\n                                        \"unique2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"postgres_select.test_plan\\/onek2\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_select.test_plan\\/onek2\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"unique1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_9.plan
index 87ca19b0da0..9c77fcf4b28 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek2\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Scan\",\n              \"scan_by\":\n                [\n                  \"unique1 [-inf, \\\"20\\\")\",\n                  \"unique2\"\n                ],\n              \"limit\":\"\\\"1001\\\"\",\n              \"reverse\":true,\n              \"columns\":\n                [\n                  \"stringu1\",\n                  \"unique1\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select.test_plan\\/onek2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Scan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, 20)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"limit\":\"1001\",\n          \"reverse\":true,\n          \"columns\":\n            [\n              \"stringu1\",\n              \"unique1\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-TableRangeScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"TableRangeScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"stringu1\",\n                                        \"unique1\"\n                                      ],\n                                    \"ReadLimit\":\"1001\",\n                                    \"ReadRange\":\n                                      [\n                                        \"unique1 (-\u221e, 20)\",\n                                        \"unique2 (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Reverse\":true,\n                                    \"Table\":\"postgres_select.test_plan\\/onek2\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"postgres_select.test_plan\\/onek2\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"unique1 (Desc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_1.plan
index 9a0e8c5da32..d318b4ed313 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select_distinct.test_plan\\/onek\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"two\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select_distinct.test_plan\\/onek\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"two\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":6,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":5,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":4,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.two\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":3,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"two\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"two\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"unique1 (-\u221e, +\u221e)\",\n                                                    \"unique2 (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_select_distinct.test_plan\\/onek\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_select_distinct.test_plan\\/onek\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"two (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_2.plan
index e34e62985e8..f2e0a442459 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select_distinct.test_plan\\/onek\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"ten\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select_distinct.test_plan\\/onek\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"ten\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":6,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":5,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":4,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.ten\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":3,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"ten\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"ten\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"unique1 (-\u221e, +\u221e)\",\n                                                    \"unique2 (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_select_distinct.test_plan\\/onek\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_select_distinct.test_plan\\/onek\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"ten (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_3.plan
index 12da60b662c..7963d416faa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select_distinct.test_plan\\/onek\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"string4\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select_distinct.test_plan\\/onek\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"string4\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":6,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":5,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":4,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.string4\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":3,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"string4\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"string4\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"unique1 (-\u221e, +\u221e)\",\n                                                    \"unique2 (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_select_distinct.test_plan\\/onek\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_select_distinct.test_plan\\/onek\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"string4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_4.plan
index 07b8b731d25..665935f22a3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select_distinct.test_plan\\/onek\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"string4\",\n                  \"ten\",\n                  \"two\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select_distinct.test_plan\\/onek\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"string4\",\n              \"ten\",\n              \"two\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":6,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":5,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":4,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":3,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"string4\",\n                                        \"ten\",\n                                        \"two\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"string4\",\n                                                    \"ten\",\n                                                    \"two\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"unique1 (-\u221e, +\u221e)\",\n                                                    \"unique2 (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_select_distinct.test_plan\\/onek\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_select_distinct.test_plan\\/onek\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"two (Asc)\",\n                            \"string4 (Asc)\",\n                            \"ten (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_5.plan
index e58e301d801..083c81bb7cc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_select_distinct.test_plan\\/tenk1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"unique1\",\n                  \"unique2\"\n                ],\n              \"columns\":\n                [\n                  \"four\",\n                  \"two\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select_distinct.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"four\",\n              \"two\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":6,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":5,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":4,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Aggregate-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":3,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"four\",\n                                        \"two\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"four\",\n                                                    \"two\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"unique1 (-\u221e, +\u221e)\",\n                                                    \"unique2 (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_select_distinct.test_plan\\/tenk1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_select_distinct.test_plan\\/tenk1\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_1.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_10.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_11.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_12.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_13.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_14.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_15.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_16.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_17.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_18.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_19.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_2.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_20.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_21.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_22.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_23.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_24.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_25.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_26.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_27.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_28.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_28.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_28.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_29.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_29.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_29.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_3.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_30.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_30.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_30.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_31.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_31.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_31.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_32.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_32.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_32.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_33.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_33.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_33.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_34.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_34.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_34.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_35.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_35.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_35.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_36.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_36.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_36.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_37.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_37.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_37.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_38.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_38.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_38.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_39.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_39.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_39.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_4.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_40.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_40.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_40.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_41.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_41.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_41.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_42.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_42.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_42.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_43.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_43.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_43.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_44.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_44.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_44.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_45.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_45.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_45.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_5.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_6.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_7.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_8.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_9.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-strings.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_1.plan
index 7d22e88b9cb..cb3ea2f0a55 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"empno\"\n                ],\n              \"columns\":\n                [\n                  \"depname\",\n                  \"empno\",\n                  \"salary\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"empno (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"depname\",\n              \"empno\",\n              \"salary\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Sort-ConstantExpr\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Inputs\":\n                                      [\n                                        1,\n                                        2\n                                      ],\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Sort\",\n                                    \"SortBy\":\"row.nsum\"\n                                  },\n                                  {\n                                    \"Iterator\":\"item\",\n                                    \"Name\":\"Iterator\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"depname\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Sort-ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Sort\",\n                                                \"SortBy\":\"row.salary\"\n                                              },\n                                              {\n                                                \"Iterator\":\"list\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"KeyColumns\":\n                                                  [\n                                                    \"depname\"\n                                                  ],\n                                                \"Node Type\":\"HashShuffle\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"depname\",\n                                                                \"empno\",\n                                                                \"salary\"\n                                                              ],\n                                                            \"ReadRange\":\n                                                              [\n                                                                \"empno (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_window.test_plan\\/empsalary\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_window.test_plan\\/empsalary\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"depname (Asc)\",\n                            \"salary (Asc)\",\n                            \"empno (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_2.plan
index 7d22e88b9cb..811889bd0b4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"empno\"\n                ],\n              \"columns\":\n                [\n                  \"depname\",\n                  \"empno\",\n                  \"salary\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"empno (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"depname\",\n              \"empno\",\n              \"salary\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":6,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":5,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":4,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Sort-ConstantExpr\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Inputs\":\n                                      [\n                                        1,\n                                        2\n                                      ],\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Sort\",\n                                    \"SortBy\":\"row.salary\"\n                                  },\n                                  {\n                                    \"Iterator\":\"list\",\n                                    \"Name\":\"Iterator\"\n                                  }\n                                ],\n                              \"PlanNodeId\":3,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"depname\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"depname\",\n                                                    \"empno\",\n                                                    \"salary\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"empno (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_window.test_plan\\/empsalary\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_window.test_plan\\/empsalary\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"depname (Asc)\",\n                            \"rank (Asc)\",\n                            \"empno (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_3.plan
index 7d22e88b9cb..811889bd0b4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"empno\"\n                ],\n              \"columns\":\n                [\n                  \"depname\",\n                  \"empno\",\n                  \"salary\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"empno (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"depname\",\n              \"empno\",\n              \"salary\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":6,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":5,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":4,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Sort-ConstantExpr\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Inputs\":\n                                      [\n                                        1,\n                                        2\n                                      ],\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Sort\",\n                                    \"SortBy\":\"row.salary\"\n                                  },\n                                  {\n                                    \"Iterator\":\"list\",\n                                    \"Name\":\"Iterator\"\n                                  }\n                                ],\n                              \"PlanNodeId\":3,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"depname\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"depname\",\n                                                    \"empno\",\n                                                    \"salary\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"empno (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_window.test_plan\\/empsalary\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_window.test_plan\\/empsalary\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"depname (Asc)\",\n                            \"rank (Asc)\",\n                            \"empno (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_4.plan
index 7d22e88b9cb..9cb194ff3bc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"empno\"\n                ],\n              \"columns\":\n                [\n                  \"depname\",\n                  \"empno\",\n                  \"salary\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"empno (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"depname\",\n              \"empno\",\n              \"salary\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":6,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":5,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":4,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Sort-ConstantExpr\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Inputs\":\n                                      [\n                                        1,\n                                        2\n                                      ],\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Sort\",\n                                    \"SortBy\":\"row.salary\"\n                                  },\n                                  {\n                                    \"Iterator\":\"list\",\n                                    \"Name\":\"Iterator\"\n                                  }\n                                ],\n                              \"PlanNodeId\":3,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"depname\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"depname\",\n                                                    \"empno\",\n                                                    \"salary\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"empno (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_window.test_plan\\/empsalary\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_window.test_plan\\/empsalary\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"rank (Asc)\",\n                            \"empno (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_5.plan
index 369e546e5b6..b1b20fb1ac2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"empno\"\n                ],\n              \"columns\":\n                [\n                  \"depname\",\n                  \"salary\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"empno (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"depname\",\n              \"salary\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":10,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Sort-ConstantExpr\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Inputs\":\n                                      [\n                                        1,\n                                        2\n                                      ],\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.row_number\"\n                                  },\n                                  {\n                                    \"Name\":\"Sort\",\n                                    \"SortBy\":\"row.depname\"\n                                  },\n                                  {\n                                    \"Iterator\":\"item\",\n                                    \"Name\":\"Iterator\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"UnionAll\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Sort-ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Sort\",\n                                                \"SortBy\":\"row.depname\"\n                                              },\n                                              {\n                                                \"Iterator\":\"list\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":4,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"Aggregate\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Aggregate\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":3,\n                                                      \"Plans\":\n                                                        [\n                                                          {\n                                                            \"KeyColumns\":\n                                                              [\n                                                                \"depname\"\n                                                              ],\n                                                            \"Node Type\":\"HashShuffle\",\n                                                            \"PlanNodeId\":2,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"TableFullScan\",\n                                                                  \"Operators\":\n                                                                    [\n                                                                      {\n                                                                        \"Name\":\"TableFullScan\",\n                                                                        \"ReadColumns\":\n                                                                          [\n                                                                            \"depname\",\n                                                                            \"salary\"\n                                                                          ],\n                                                                        \"ReadRange\":\n                                                                          [\n                                                                            \"empno (-\u221e, +\u221e)\"\n                                                                          ],\n                                                                        \"Table\":\"postgres_window.test_plan\\/empsalary\"\n                                                                      }\n                                                                    ],\n                                                                  \"PlanNodeId\":1,\n                                                                  \"Tables\":\n                                                                    [\n                                                                      \"postgres_window.test_plan\\/empsalary\"\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          }\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"row_number (Desc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_6.plan
index 9cac910a167..2a62233bbda 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"empno\"\n                ],\n              \"columns\":\n                [\n                  \"salary\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"empno (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"salary\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":6,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":5,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":4,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-Sort-ConstantExpr\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Inputs\":\n                                      [\n                                        1,\n                                        2\n                                      ],\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"Sort\",\n                                    \"SortBy\":\"row.salary\"\n                                  },\n                                  {\n                                    \"Iterator\":\"item\",\n                                    \"Name\":\"Iterator\"\n                                  }\n                                ],\n                              \"PlanNodeId\":3,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"UnionAll\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"salary\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"empno (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_window.test_plan\\/empsalary\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_window.test_plan\\/empsalary\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_7.plan
index 369e546e5b6..cd30f7c032d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"empno\"\n                ],\n              \"columns\":\n                [\n                  \"depname\",\n                  \"salary\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"empno (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"depname\",\n              \"salary\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":6,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":5,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":4,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-Sort-ConstantExpr\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Inputs\":\n                                      [\n                                        1,\n                                        2\n                                      ],\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"Sort\",\n                                    \"SortBy\":\"row.salary\"\n                                  },\n                                  {\n                                    \"Iterator\":\"item\",\n                                    \"Name\":\"Iterator\"\n                                  }\n                                ],\n                              \"PlanNodeId\":3,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"depname\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"depname\",\n                                                    \"salary\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"empno (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_window.test_plan\\/empsalary\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_window.test_plan\\/empsalary\"\n                                            ]\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_1.plan
index 861e70f7ec5..ade44faff4d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_insert.test_plan\\/a2\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_insert.test_plan\\/a2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Aggregate-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":null,\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_insert.test_plan\\/a2\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_insert.test_plan\\/a2\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_2.plan
index 861e70f7ec5..ade44faff4d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_insert.test_plan\\/a2\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_insert.test_plan\\/a2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Aggregate-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":null,\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_insert.test_plan\\/a2\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_insert.test_plan\\/a2\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_3.plan
index 66922dec823..bec466d58d6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_insert.test_plan\\/a2\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ],\n              \"limit\":\"\\\"1001\\\"\",\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_insert.test_plan\\/a2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\"\n            ],\n          \"limit\":\"1001\",\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Limit-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"Limit\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadLimit\":\"1001\",\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_insert.test_plan\\/a2\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_insert.test_plan\\/a2\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_1.plan
index f70032479fa..8c7442c7630 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_10.plan
index bcbfd079e3a..7b8a97617e7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_100.plan
index 1c345145e58..b7e5dc3ff93 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_100.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_100.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_101.plan
index 87b661ea74c..70758317564 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_101.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_101.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_102.plan
index 1c345145e58..be569a91ca8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_102.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_102.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_103.plan
index c7a27245c66..05b046168e2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_103.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_103.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_104.plan
index 1c345145e58..e170efaf211 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_104.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_104.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_105.plan
index 1c345145e58..f3c010dc01e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_105.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_105.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_106.plan
index 1c345145e58..7bd43d4532e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_106.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_106.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_107.plan
index 1c345145e58..f029f05c64b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_107.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_107.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_108.plan
index edb349302b4..57af88738b0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_108.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_108.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_109.plan
index 1c345145e58..2f45cd67c0f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_109.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_109.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_11.plan
index c7a27245c66..46c05534406 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_110.plan
index 1c345145e58..1a7b685913f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_110.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_110.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_111.plan
index 1c345145e58..09b6f50a7f6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_111.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_111.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_112.plan
index 1c345145e58..defa9e11fb9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_112.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_112.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_113.plan
index 09dc1fd0588..88ed3106832 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_113.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_113.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 \\u003C 110 Or items2 \\u003E 150 Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_114.plan
index 87b661ea74c..9e1d5122181 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_114.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_114.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_115.plan
index c7a27245c66..eadef3bdc08 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_115.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_115.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_116.plan
index 8a38d97920c..f9728972ab1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_116.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_116.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_117.plan
index edb349302b4..2abedc67417 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_117.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_117.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_118.plan
index ea98d942ef3..103c32c6218 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_118.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_118.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 \\u003C 110 Or items2 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_119.plan
index 1c345145e58..53fd1fd2393 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_119.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_119.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_12.plan
index 1c345145e58..1946459a141 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_120.plan
index 1c345145e58..0a0edd19206 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_120.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_120.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_121.plan
index b71aa0ab7a9..bcae9d1c3bd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_121.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_121.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_122.plan
index 1c345145e58..d9ccf4e10cb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_122.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_122.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_123.plan
index 1c345145e58..66851a7d2aa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_123.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_123.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_124.plan
index 1c345145e58..4c8a51d5cbc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_124.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_124.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_125.plan
index 1c345145e58..6c2d00ef917 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_125.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_125.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_126.plan
index edb349302b4..393ae6bd3ad 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_126.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_126.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_127.plan
index 1c345145e58..d797e4291e5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_127.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_127.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_13.plan
index c7a27245c66..274fea6e394 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_14.plan
index 1c345145e58..9025666b137 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_15.plan
index 1c345145e58..e25ce061bb1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_16.plan
index c7a27245c66..8232d5f78ba 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_17.plan
index c7a27245c66..5fbc02ab94b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_18.plan
index c7a27245c66..d1ea75383af 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_19.plan
index 1c345145e58..02ec5c356b3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_2.plan
index b71aa0ab7a9..5fe2e22276c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_20.plan
index c7a27245c66..fef9da14fa4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_21.plan
index 1c345145e58..93d88737cc6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_22.plan
index 1c345145e58..8336f250378 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_23.plan
index 3ec31a53085..eba66114f9f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_24.plan
index 1c345145e58..d96e9ce8cc3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_25.plan
index 4c8c12a690a..d9037cb4f78 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_26.plan
index 1c345145e58..f402d560342 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_27.plan
index edb349302b4..e1444578499 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_28.plan
index 1c345145e58..8afd1a3055c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_28.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_28.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_29.plan
index 1c345145e58..5fe4e9edc11 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_29.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_29.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_3.plan
index 1c345145e58..d15dd6a33d9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_30.plan
index 1c345145e58..5fe4e9edc11 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_30.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_30.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_31.plan
index c7a27245c66..8618b1451e2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_31.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_31.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_32.plan
index 3ec31a53085..9294911a1b6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_32.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_32.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_33.plan
index 1c345145e58..77c0b8595d7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_33.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_33.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_34.plan
index 1c345145e58..667cad34e9e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_34.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_34.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_35.plan
index 2b6b69f855a..4d5fe2fc526 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_35.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_35.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_36.plan
index 2b6b69f855a..399e172e405 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_36.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_36.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_37.plan
index 1c345145e58..03e2e2c22a7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_37.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_37.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_38.plan
index 1c345145e58..ebda25f0cfd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_38.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_38.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_39.plan
index 1c345145e58..9ddd96d36cd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_39.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_39.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_4.plan
index 1c345145e58..01ebfb180bc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_40.plan
index 1c345145e58..26eec163cc2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_40.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_40.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_41.plan
index 1c345145e58..bc361ea9646 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_41.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_41.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_42.plan
index 1c345145e58..e7ca54b44a6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_42.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_42.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_43.plan
index 89c668fff9a..42ea90848dc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_43.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_43.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_44.plan
index 1c345145e58..9a9790f983c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_44.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_44.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_45.plan
index 1c345145e58..524ed830533 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_45.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_45.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_46.plan
index 1c345145e58..938ecc8e10c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_46.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_46.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_47.plan
index edb349302b4..24357156716 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_47.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_47.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_48.plan
index 1c345145e58..9afd5653c42 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_48.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_48.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_49.plan
index c7a27245c66..dbec823e4ab 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_49.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_49.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_5.plan
index 1c345145e58..3ba308af0d4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_50.plan
index 1c345145e58..9dc1e535400 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_50.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_50.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_51.plan
index 1c345145e58..723d2d0206c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_51.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_51.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col7 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_52.plan
index 1c345145e58..9f0acdfd4bf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_52.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_52.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_53.plan
index 1c345145e58..6b00e6f3439 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_53.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_53.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_54.plan
index 1c345145e58..d28890d5727 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_54.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_54.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_55.plan
index 1c345145e58..43d4a4eb62b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_55.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_55.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_56.plan
index 1c345145e58..3cfab43fc88 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_56.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_56.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_57.plan
index 1c345145e58..26b2fad6d82 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_57.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_57.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_58.plan
index 256232b008d..1f3884b5416 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_58.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_58.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_59.plan
index 1c345145e58..1e8358cca4e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_59.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_59.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_6.plan
index 1c345145e58..617d17b1ab6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_60.plan
index 1c345145e58..8c38bb7357a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_60.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_60.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_61.plan
index 1c345145e58..883b55b30d2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_61.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_61.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_62.plan
index 1c345145e58..6fefd93baf6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_62.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_62.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_63.plan
index 1c345145e58..5c9d0df19bd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_63.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_63.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_64.plan
index 1c345145e58..dee2a710e0d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_64.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_64.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_65.plan
index 1c345145e58..f562fe0f9be 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_65.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_65.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_66.plan
index bcbfd079e3a..9d9d1548955 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_66.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_66.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_67.plan
index 1c345145e58..87e64f9f89c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_67.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_67.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_68.plan
index 1c345145e58..15aa41bf224 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_68.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_68.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_69.plan
index 1c345145e58..c38c87995b3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_69.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_69.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_7.plan
index 1c345145e58..1e8358cca4e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_70.plan
index 1c345145e58..a005ec13435 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_70.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_70.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_71.plan
index 577487f051a..620584ff7a4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_71.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_71.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_72.plan
index 1c345145e58..963b9bd25a3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_72.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_72.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_73.plan
index 1c345145e58..15aa41bf224 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_73.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_73.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_74.plan
index b71aa0ab7a9..5fe2e22276c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_74.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_74.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_75.plan
index edb349302b4..6c46663b42d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_75.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_75.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_76.plan
index c7a27245c66..38339a35aca 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_76.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_76.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_77.plan
index 1c345145e58..97b030e02ca 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_77.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_77.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_78.plan
index 3ec31a53085..051c6a817b0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_78.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_78.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_79.plan
index 1c345145e58..a0bf464103b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_79.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_79.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_8.plan
index 87b661ea74c..b0a449cdd49 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_80.plan
index 1c345145e58..38aed3c227e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_80.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_80.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_81.plan
index edb349302b4..3f6b4c66323 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_81.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_81.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_82.plan
index c7a27245c66..14c6b92da41 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_82.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_82.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_83.plan
index 1c345145e58..f910c05ea57 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_83.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_83.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_84.plan
index b71737138a3..af31b7de49b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_84.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_84.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_85.plan
index c7a27245c66..0052bae5f45 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_85.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_85.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_86.plan
index 2b6b69f855a..921cc3a1a0b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_86.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_86.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_87.plan
index 1c345145e58..9cabd4fddb6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_87.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_87.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_88.plan
index edb349302b4..ec66bf712a3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_88.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_88.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_89.plan
index 09dc1fd0588..08786f7f9ba 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_89.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_89.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_9.plan
index 1c345145e58..1b49e044f03 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_90.plan
index 1c345145e58..de8a91d1147 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_90.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_90.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_91.plan
index 3ec31a53085..398243fc5e8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_91.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_91.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_92.plan
index 4dfac3f4923..a01f9b69a04 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_92.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_92.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_93.plan
index 3ec31a53085..9294911a1b6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_93.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_93.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_94.plan
index edb349302b4..c8eb303136a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_94.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_94.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_95.plan
index 1c345145e58..ce2c7ac8de7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_95.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_95.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_96.plan
index b71737138a3..6b3aaf81038 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_96.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_96.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_97.plan
index 1c345145e58..09a3f0fe175 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_97.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_97.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_98.plan
index 1c345145e58..93eec09f90e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_98.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_98.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_99.plan
index 1c345145e58..453fd5ddc21 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_99.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_99.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_1.plan
index f84023f29fa..1b9f2635c54 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_10.plan
index f84023f29fa..991d420cef7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_100.plan
index f84023f29fa..90c213127c1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_100.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_100.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_101.plan
index f84023f29fa..1904c782455 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_101.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_101.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_102.plan
index aaf9d7b4156..75a8b82752a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_102.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_102.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_103.plan
index f84023f29fa..bbaad361798 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_103.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_103.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_104.plan
index f84023f29fa..897fbb42661 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_104.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_104.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_105.plan
index f84023f29fa..4c08beb33cc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_105.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_105.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_106.plan
index f84023f29fa..fdcdf26a4c8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_106.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_106.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_107.plan
index f84023f29fa..22807f632b5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_107.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_107.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_108.plan
index f84023f29fa..3184bfd0369 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_108.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_108.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_109.plan
index 8cf9084f771..f573d74b5ca 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_109.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_109.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_11.plan
index f84023f29fa..a069dc34da2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_110.plan
index aaf9d7b4156..dffbe35fe2e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_110.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_110.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col7 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_111.plan
index f84023f29fa..72d14440035 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_111.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_111.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_112.plan
index aaf9d7b4156..b533fe88ec3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_112.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_112.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_113.plan
index aaf9d7b4156..a561e969438 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_113.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_113.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_114.plan
index 1588f50e4d4..bf328bfa5e0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_114.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_114.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_115.plan
index f84023f29fa..5ba121eaf48 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_115.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_115.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_116.plan
index f84023f29fa..ec0fa2fb4e0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_116.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_116.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_117.plan
index c0c725f0c5d..923aff599e5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_117.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_117.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_118.plan
index f84023f29fa..c46f3fccad6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_118.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_118.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_119.plan
index 630b384f5f1..47a8fd227fa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_119.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_119.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_12.plan
index 390f6fd0c21..ebfe11927fb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_120.plan
index eeb4d61b36c..20da8fa835b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_120.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_120.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_121.plan
index 47e2649783e..d3838795f97 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_121.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_121.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_122.plan
index f84023f29fa..2aee4f46f9b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_122.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_122.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_123.plan
index f84023f29fa..d50443ee258 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_123.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_123.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_124.plan
index 390f6fd0c21..ebfe11927fb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_124.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_124.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_125.plan
index f84023f29fa..c92c0184a3d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_125.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_125.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_126.plan
index 1588f50e4d4..79cf0ac24b0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_126.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_126.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_127.plan
index 1588f50e4d4..491771fe35c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_127.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_127.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_128.plan
index f84023f29fa..47fce274d55 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_128.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_128.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_129.plan
index f84023f29fa..14b9a6666fa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_129.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_129.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_13.plan
index 8867d4aa3dd..979e3028cc0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_130.plan
index aaf9d7b4156..e1c4276fd03 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_130.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_130.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_131.plan
index f84023f29fa..1cd7e785750 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_131.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_131.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_132.plan
index 8cf9084f771..87ff7c9618a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_132.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_132.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_133.plan
index f84023f29fa..2365c370a28 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_133.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_133.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_134.plan
index f84023f29fa..ab32e5238f6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_134.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_134.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_135.plan
index 1588f50e4d4..552cc09d3f3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_135.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_135.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_136.plan
index f84023f29fa..7299e5e6fd9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_136.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_136.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_137.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_137.plan
index f84023f29fa..90c213127c1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_137.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_137.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_138.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_138.plan
index f84023f29fa..0e213abf75b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_138.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_138.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_139.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_139.plan
index f84023f29fa..6924740cfcb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_139.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_139.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_14.plan
index f84023f29fa..382ffff7ae1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_140.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_140.plan
index b430ecf2192..c77b6870b13 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_140.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_140.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_141.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_141.plan
index 1588f50e4d4..863efd8477a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_141.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_141.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_142.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_142.plan
index f84023f29fa..1173df3d3d7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_142.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_142.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_143.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_143.plan
index f84023f29fa..ca07d61260f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_143.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_143.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_144.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_144.plan
index f84023f29fa..41d3dfbcfbf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_144.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_144.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_145.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_145.plan
index 1588f50e4d4..e8b060247af 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_145.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_145.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_15.plan
index bd22fc74539..4609c7c221a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_16.plan
index 2a82df28c69..8f86a6d75a3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items1 \\u003C 110 Or items1 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_17.plan
index f84023f29fa..2cadafe3b69 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_18.plan
index 3d77d01c4f9..078b9764e8c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_19.plan
index 1f48b9c7afd..f1b01ffb908 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_2.plan
index aaf9d7b4156..feb5c8e6c98 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_20.plan
index f84023f29fa..0a75f905ef5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_21.plan
index f84023f29fa..66c26225808 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_22.plan
index 47e2649783e..cce50f78753 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 \\u003C 110 Or items2 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_23.plan
index f84023f29fa..22807f632b5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_24.plan
index f84023f29fa..79cac18a9d8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_25.plan
index f84023f29fa..4c08beb33cc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_26.plan
index f84023f29fa..4f7840d3a36 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_27.plan
index c0c725f0c5d..9c8d6b32f86 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_28.plan
index 55c9e88a0e4..72e5984a6b8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_28.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_28.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_29.plan
index f84023f29fa..73768cd0b2d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_29.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_29.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_3.plan
index f84023f29fa..dd1e56838f1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_30.plan
index c4d83cf5193..4b91693624f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_30.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_30.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_31.plan
index f84023f29fa..63b2b61c8b2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_31.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_31.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_32.plan
index f84023f29fa..01df83bf5ce 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_32.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_32.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_33.plan
index f84023f29fa..4540007666f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_33.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_33.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_34.plan
index f84023f29fa..9753b910c22 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_34.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_34.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_35.plan
index f84023f29fa..4b4730f1373 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_35.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_35.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_36.plan
index f84023f29fa..389eaea8e01 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_36.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_36.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_37.plan
index f84023f29fa..11f3237b59e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_37.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_37.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_38.plan
index f84023f29fa..82e9e4a12d6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_38.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_38.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_39.plan
index f84023f29fa..d28bca87611 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_39.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_39.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_4.plan
index f84023f29fa..931169a5f3e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_40.plan
index c0c725f0c5d..6dd05bff889 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_40.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_40.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_41.plan
index f84023f29fa..4c653241101 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_41.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_41.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_42.plan
index bd22fc74539..950337d4d28 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_42.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_42.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_43.plan
index 1f48b9c7afd..1a5f26fb5a4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_43.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_43.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_44.plan
index aaf9d7b4156..3a1a37fced9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_44.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_44.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_45.plan
index f84023f29fa..da3e4dfec39 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_45.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_45.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_46.plan
index f84023f29fa..d424708a9de 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_46.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_46.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_47.plan
index f84023f29fa..1b9f2635c54 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_47.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_47.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_48.plan
index f84023f29fa..8b1057a82e2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_48.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_48.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_49.plan
index 1588f50e4d4..bf328bfa5e0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_49.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_49.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_5.plan
index f84023f29fa..f78fb65714c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_50.plan
index f84023f29fa..782e9aac94d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_50.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_50.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_51.plan
index 71a1d1bae6e..42c7e567e2d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_51.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_51.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_52.plan
index 1f48b9c7afd..7989b4d61c9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_52.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_52.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_53.plan
index 630b384f5f1..9fcc82be8a8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_53.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_53.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items1 \\u003C 110 Or items1 \\u003E 150 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_54.plan
index aaf9d7b4156..6ec3f0c1657 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_54.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_54.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_55.plan
index aaf9d7b4156..75235e8be99 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_55.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_55.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_56.plan
index c0c725f0c5d..eb36ad59746 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_56.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_56.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_57.plan
index f84023f29fa..bf48afb5997 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_57.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_57.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_58.plan
index f84023f29fa..05b503bb89b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_58.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_58.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_59.plan
index f84023f29fa..117686a2e05 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_59.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_59.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_6.plan
index f84023f29fa..a404e8b9566 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_60.plan
index aaf9d7b4156..b502ba4858c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_60.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_60.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_61.plan
index f84023f29fa..7cd737361ac 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_61.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_61.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_62.plan
index f84023f29fa..9dbf6420360 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_62.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_62.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_63.plan
index 947a0e7da4c..704a0b13190 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_63.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_63.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_64.plan
index f84023f29fa..fd962e828f5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_64.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_64.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_65.plan
index 947a0e7da4c..db80bd8b3c3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_65.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_65.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_66.plan
index f84023f29fa..b08d8184617 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_66.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_66.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_67.plan
index f84023f29fa..7deb20b3490 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_67.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_67.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_68.plan
index f84023f29fa..f454056680d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_68.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_68.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_69.plan
index bd22fc74539..734a6b7e267 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_69.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_69.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_7.plan
index bd22fc74539..d621c3f761c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_70.plan
index f84023f29fa..614fc4bce40 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_70.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_70.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_71.plan
index f84023f29fa..c3edfda93e2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_71.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_71.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_72.plan
index f84023f29fa..7944be42018 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_72.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_72.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_73.plan
index f84023f29fa..30ce3d48c9d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_73.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_73.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_74.plan
index f84023f29fa..f9a82b282b6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_74.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_74.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_75.plan
index f84023f29fa..4157785a8c6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_75.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_75.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_76.plan
index f84023f29fa..6cc62dcb92d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_76.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_76.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_77.plan
index bd22fc74539..f8cd81c7ce6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_77.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_77.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_78.plan
index f84023f29fa..11226b36839 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_78.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_78.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_79.plan
index f84023f29fa..847cbe06bac 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_79.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_79.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_8.plan
index bd22fc74539..3a65f4dbc9a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_80.plan
index 1588f50e4d4..d56846f05aa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_80.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_80.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_81.plan
index 1588f50e4d4..c3df6ca0ea9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_81.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_81.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_82.plan
index f84023f29fa..fb37a3650a0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_82.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_82.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_83.plan
index 3d1e2da0b4f..2cc1207edf7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_83.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_83.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_84.plan
index 2a82df28c69..920f0fc4dee 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_84.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_84.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_85.plan
index f84023f29fa..b75a1690f86 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_85.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_85.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_86.plan
index 1588f50e4d4..85f65f0c5cf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_86.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_86.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_87.plan
index f84023f29fa..9abea6c85ea 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_87.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_87.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_88.plan
index f85e1d6b6aa..a9e251c6168 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_88.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_88.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_89.plan
index 3d1e2da0b4f..a4bb8a8d539 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_89.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_89.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_9.plan
index f84023f29fa..46c26957e1e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_90.plan
index aaf9d7b4156..7815ceae85a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_90.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_90.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... And ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_91.plan
index aaf9d7b4156..eaa472a0cce 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_91.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_91.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_92.plan
index bd22fc74539..dea4d530946 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_92.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_92.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_93.plan
index f84023f29fa..0cee7a5743b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_93.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_93.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_94.plan
index c0c725f0c5d..25c4111d811 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_94.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_94.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_95.plan
index f84023f29fa..412dd2114f6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_95.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_95.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_96.plan
index f84023f29fa..22807f632b5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_96.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_96.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_97.plan
index bd22fc74539..3e27a6a01a2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_97.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_97.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_98.plan
index f84023f29fa..1b2d78168fe 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_98.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_98.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_99.plan
index aaf9d7b4156..39fe488bb7e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_99.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_99.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_1.plan
index 6589ccd3c0d..e577cec8485 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_10.plan
index 62f070cfe31..c3f9d0f027c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_100.plan
index 62f070cfe31..d28f680062c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_100.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_100.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_101.plan
index 62f070cfe31..5b864523a09 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_101.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_101.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_102.plan
index 6e2af344109..a100a58c3e7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_102.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_102.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 \\u003C 110 Or items2 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_103.plan
index 62f070cfe31..063cd87659f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_103.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_103.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_104.plan
index 62f070cfe31..f20f91312ed 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_104.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_104.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_105.plan
index 62f070cfe31..63ba9b99fb6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_105.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_105.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_106.plan
index 62f070cfe31..d9e39b9ec98 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_106.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_106.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_107.plan
index 62f070cfe31..e2085ba8022 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_107.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_107.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_108.plan
index 6589ccd3c0d..c3badc2deec 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_108.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_108.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_109.plan
index 62f070cfe31..52e8b261398 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_109.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_109.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_11.plan
index 62f070cfe31..64770d25402 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_110.plan
index 2c5906cca1e..1b5d7e123ae 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_110.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_110.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_111.plan
index 6589ccd3c0d..1c43b82fe55 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_111.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_111.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_112.plan
index cc890a3ca70..70702f1d087 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_112.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_112.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_113.plan
index cc890a3ca70..52ca61a9706 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_113.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_113.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_114.plan
index 6589ccd3c0d..72430484e6e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_114.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_114.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_115.plan
index 62f070cfe31..0b7bad0a52a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_115.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_115.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_116.plan
index 62f070cfe31..481e7f8039a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_116.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_116.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_117.plan
index 62f070cfe31..e4f4d6fe3bf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_117.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_117.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_118.plan
index e882fce3845..add0d9ff01c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_118.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_118.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or items1 \\u003C 110 Or items1 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_119.plan
index 6589ccd3c0d..1d1377eccd1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_119.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_119.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_12.plan
index 0fe85fe0cfb..88279f80301 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_120.plan
index 6589ccd3c0d..750fd993834 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_120.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_120.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_121.plan
index 62f070cfe31..c8c6258b97d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_121.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_121.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_122.plan
index 62f070cfe31..1ff7799fe30 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_122.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_122.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_123.plan
index 020b64b3f44..75b87b5d8ee 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_123.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_123.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_124.plan
index 6e2af344109..63a906c2467 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_124.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_124.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_125.plan
index 62f070cfe31..028ef3b1548 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_125.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_125.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_126.plan
index 62f070cfe31..ac9afe9c212 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_126.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_126.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_127.plan
index 6589ccd3c0d..7deb6877eda 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_127.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_127.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_128.plan
index 5d63c0f1af6..a299340cecf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_128.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_128.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_129.plan
index 62f070cfe31..4e4f0555bd6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_129.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_129.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_13.plan
index cc890a3ca70..c3b2515836d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_130.plan
index 62f070cfe31..0b7bad0a52a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_130.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_130.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_131.plan
index 62f070cfe31..b598ce097f0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_131.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_131.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_132.plan
index 6589ccd3c0d..c952759d97c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_132.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_132.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_133.plan
index 62f070cfe31..97f9f5c3443 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_133.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_133.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_134.plan
index 62f070cfe31..f1bdbc4201f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_134.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_134.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_135.plan
index 32813bd8a04..c26441d6990 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_135.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_135.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_136.plan
index 62f070cfe31..75002583b62 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_136.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_136.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_137.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_137.plan
index 6589ccd3c0d..bafc43e335e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_137.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_137.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_138.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_138.plan
index 62f070cfe31..f1047e2a3f4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_138.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_138.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_139.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_139.plan
index 62f070cfe31..ae60460c08b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_139.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_139.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_14.plan
index 62f070cfe31..d1f48a83d2f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_140.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_140.plan
index 62f070cfe31..133ce18d6bc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_140.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_140.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_141.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_141.plan
index 6589ccd3c0d..c7ad93c9e52 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_141.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_141.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_15.plan
index 62f070cfe31..552c90e7d6b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_16.plan
index 0caf670ea2c..88201df542d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_17.plan
index 62f070cfe31..2e752992b4c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_18.plan
index 62f070cfe31..e4f4d6fe3bf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_19.plan
index 6589ccd3c0d..d1a07a8df20 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_2.plan
index 985726e4048..47517b7363b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_20.plan
index 0caf670ea2c..0ecb5f2c6e1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_21.plan
index 62f070cfe31..3df38bbb931 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_22.plan
index 62f070cfe31..e4f4d6fe3bf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_23.plan
index 62f070cfe31..b84f20308ab 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_24.plan
index 0fe85fe0cfb..88279f80301 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_25.plan
index 6589ccd3c0d..d0f8421391f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_26.plan
index 32813bd8a04..c6613c64120 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_27.plan
index c82006fdb83..28d0258402b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_28.plan
index 62f070cfe31..c1b93b60a99 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_28.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_28.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_29.plan
index 9062786620e..5e542fe7194 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_29.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_29.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_3.plan
index 6589ccd3c0d..c212e0ccd1e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_30.plan
index 62f070cfe31..f1047e2a3f4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_30.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_30.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_31.plan
index 62f070cfe31..55e8f54b16d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_31.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_31.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_32.plan
index 45e9950db3a..30237fc7166 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_32.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_32.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_33.plan
index cc890a3ca70..1550e8051f1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_33.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_33.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_34.plan
index 62f070cfe31..89c8d587743 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_34.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_34.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_35.plan
index 62f070cfe31..b2656212769 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_35.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_35.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_36.plan
index 62f070cfe31..acb3345d63f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_36.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_36.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_37.plan
index 32813bd8a04..fb497c47d62 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_37.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_37.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_38.plan
index 62f070cfe31..9f67e570e18 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_38.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_38.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_39.plan
index 62f070cfe31..2e20f6a6fb0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_39.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_39.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_4.plan
index 62f070cfe31..234ef326b3c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_40.plan
index 62f070cfe31..5caa548dc25 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_40.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_40.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_41.plan
index 6589ccd3c0d..b1a67a8f5d4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_41.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_41.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_42.plan
index 62f070cfe31..97effda0479 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_42.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_42.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_43.plan
index 62f070cfe31..fee4ac3d3fe 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_43.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_43.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_44.plan
index 32813bd8a04..d5aedacb826 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_44.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_44.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_45.plan
index 62f070cfe31..044a10fe9e6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_45.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_45.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_46.plan
index 62f070cfe31..13dcbb28158 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_46.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_46.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_47.plan
index 62f070cfe31..10a9848e12d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_47.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_47.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_48.plan
index 62f070cfe31..f1047e2a3f4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_48.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_48.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_49.plan
index 6589ccd3c0d..521da38226c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_49.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_49.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_5.plan
index 32813bd8a04..a5e904611e0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_50.plan
index 62f070cfe31..78c3912a313 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_50.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_50.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_51.plan
index 45e9950db3a..551e4828a4f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_51.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_51.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_52.plan
index 6589ccd3c0d..fc6f7c98b7e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_52.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_52.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_53.plan
index 62f070cfe31..faa76a02833 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_53.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_53.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_54.plan
index 62f070cfe31..7c0bf528190 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_54.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_54.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_55.plan
index 32813bd8a04..297b5a7670a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_55.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_55.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_56.plan
index 62f070cfe31..79630fe575b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_56.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_56.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_57.plan
index 32813bd8a04..2a5b5c970d9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_57.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_57.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_58.plan
index 62f070cfe31..044a10fe9e6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_58.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_58.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_59.plan
index 6589ccd3c0d..e5a0dfdf026 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_59.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_59.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_6.plan
index 6589ccd3c0d..0db559efd4d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_60.plan
index 62f070cfe31..95de851baf6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_60.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_60.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_61.plan
index 62f070cfe31..64770d25402 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_61.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_61.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_62.plan
index 32813bd8a04..4be89edb8ea 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_62.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_62.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_63.plan
index 6589ccd3c0d..449d635110c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_63.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_63.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_64.plan
index 6589ccd3c0d..756a3e40b9a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_64.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_64.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_65.plan
index 985726e4048..8dbabb5f3d9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_65.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_65.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_66.plan
index 6f771244338..f81d23a6d53 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_66.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_66.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_67.plan
index 62f070cfe31..50397f0c553 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_67.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_67.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_68.plan
index 62f070cfe31..ed63405af5f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_68.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_68.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_69.plan
index e08a5489573..b2ed390fc36 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_69.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_69.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_7.plan
index 6589ccd3c0d..fbf7a2af11d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_70.plan
index 62f070cfe31..f831ae8081f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_70.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_70.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_71.plan
index 62f070cfe31..bd334403847 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_71.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_71.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_72.plan
index cc890a3ca70..933b76985f4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_72.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_72.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_73.plan
index 62f070cfe31..fd97076db4f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_73.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_73.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_74.plan
index 66ddf3a5609..769f035412d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_74.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_74.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_75.plan
index 32813bd8a04..f8bc30421a4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_75.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_75.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_76.plan
index 62f070cfe31..fdbde42ed88 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_76.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_76.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_77.plan
index 45e9950db3a..551e4828a4f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_77.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_77.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_78.plan
index 020b64b3f44..95a2cc8ba83 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_78.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_78.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_79.plan
index 62f070cfe31..adafb114d26 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_79.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_79.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_8.plan
index 6589ccd3c0d..10052287dc1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_80.plan
index 62f070cfe31..7c0bf528190 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_80.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_80.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_81.plan
index 45e9950db3a..30237fc7166 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_81.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_81.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_82.plan
index 62f070cfe31..7c0fd12ae3c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_82.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_82.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_83.plan
index 62f070cfe31..a9d4fa391f4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_83.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_83.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_84.plan
index 62f070cfe31..7f23a020635 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_84.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_84.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_85.plan
index 62f070cfe31..3ddf6c37223 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_85.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_85.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_86.plan
index 62f070cfe31..5be14712a59 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_86.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_86.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_87.plan
index 6589ccd3c0d..8c2d2698365 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_87.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_87.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_88.plan
index 3a0a00a1d7b..bc54949a5f6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_88.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_88.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_89.plan
index 32813bd8a04..a49a8dc6d09 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_89.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_89.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_9.plan
index 62f070cfe31..5488b20dcb4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_90.plan
index 62f070cfe31..f1047e2a3f4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_90.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_90.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_91.plan
index 62f070cfe31..d7219714353 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_91.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_91.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_92.plan
index 6589ccd3c0d..c025d838827 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_92.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_92.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_93.plan
index 62f070cfe31..56b846d642b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_93.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_93.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_94.plan
index 527106bd2ea..8217f808624 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_94.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_94.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_95.plan
index 32813bd8a04..36e4a7443d6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_95.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_95.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_96.plan
index 62f070cfe31..d3b9ebefd7b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_96.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_96.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_97.plan
index 985726e4048..5a5ba36679f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_97.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_97.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_98.plan
index 62f070cfe31..97cc9cddbbb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_98.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_98.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_99.plan
index 62f070cfe31..ffe24ec0314 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_99.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_99.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_1.plan
index 87efecdb20b..d2f5fa8860a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_10.plan
index 87efecdb20b..a2f1ab62bce 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_100.plan
index 369ff3fa96f..bace15c8fd4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_100.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_100.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_101.plan
index 87efecdb20b..956983577f6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_101.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_101.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_102.plan
index 87efecdb20b..b7a2a1d7e12 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_102.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_102.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_103.plan
index 87efecdb20b..9e6b01c923b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_103.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_103.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_104.plan
index 87efecdb20b..8d46f9c1d33 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_104.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_104.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_105.plan
index bd9dd0bbff8..42293ec3479 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_105.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_105.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_106.plan
index 87efecdb20b..d6d59360ad2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_106.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_106.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_107.plan
index 32f2192bcdf..ea9289c923c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_107.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_107.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_108.plan
index 87efecdb20b..361fb81c046 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_108.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_108.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_109.plan
index 87efecdb20b..9997e3ec2f5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_109.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_109.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_11.plan
index 87efecdb20b..eac8d6e57b4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_110.plan
index 32f2192bcdf..6faebd1440b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_110.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_110.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_111.plan
index 32f2192bcdf..b1bd40cda5b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_111.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_111.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_112.plan
index 87efecdb20b..336caf33c6d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_112.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_112.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_113.plan
index 369ff3fa96f..5861b20daf8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_113.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_113.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_114.plan
index 32f2192bcdf..8684ef6fda5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_114.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_114.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_115.plan
index 32f2192bcdf..480c2149266 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_115.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_115.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_116.plan
index 32f2192bcdf..18f48881550 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_116.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_116.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_117.plan
index b15b66d53c8..dfbeeec1c94 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_117.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_117.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_118.plan
index 87efecdb20b..5e92ad16342 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_118.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_118.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_119.plan
index 369ff3fa96f..fa1acd34e18 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_119.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_119.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_12.plan
index 13a49050de6..6272ff89e97 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_120.plan
index 87efecdb20b..b58adba09af 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_120.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_120.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_121.plan
index 87efecdb20b..71d37d9c707 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_121.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_121.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_122.plan
index b15b66d53c8..8b26a692ac7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_122.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_122.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_123.plan
index 32f2192bcdf..46ee70aa76a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_123.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_123.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_124.plan
index 87efecdb20b..f0d1d0db307 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_124.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_124.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_125.plan
index 860e20c6688..dea873c944f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_125.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_125.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_126.plan
index 32f2192bcdf..a57e6154855 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_126.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_126.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_127.plan
index ccf67fb2ad4..9ffd59fd9e2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_127.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_127.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_128.plan
index 87efecdb20b..a0d09130ca3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_128.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_128.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_129.plan
index 87efecdb20b..c5cc4b2f806 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_129.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_129.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_13.plan
index 369ff3fa96f..7c3cd495922 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_130.plan
index bd9dd0bbff8..1072339c824 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_130.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_130.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_131.plan
index 87efecdb20b..db022b39ca8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_131.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_131.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_132.plan
index 87efecdb20b..b4724b3446b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_132.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_132.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_133.plan
index 32f2192bcdf..92ff465556a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_133.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_133.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_134.plan
index 32f2192bcdf..35440b7832a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_134.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_134.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_135.plan
index 87efecdb20b..f903d179960 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_135.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_135.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_136.plan
index 87efecdb20b..2e5853b9d16 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_136.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_136.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_14.plan
index 87efecdb20b..fd3e3267379 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_15.plan
index 369ff3fa96f..88a17017ad2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_16.plan
index 87efecdb20b..85c5f514bb2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_17.plan
index 87efecdb20b..fbb9b3c1098 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_18.plan
index 87efecdb20b..42fb9c20351 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_19.plan
index 87efecdb20b..d8781e227cd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_2.plan
index 32f2192bcdf..0bd5353da4a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_20.plan
index 860e20c6688..12cc11d0682 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_21.plan
index 32f2192bcdf..6366fc69aaf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_22.plan
index d6b2664628f..40f213147e5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_23.plan
index 87efecdb20b..7751fa12eae 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_24.plan
index d69a9cabb87..b7ab3d8acb3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_25.plan
index 87efecdb20b..496fb4faf78 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_26.plan
index 87efecdb20b..d2f5fa8860a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_27.plan
index 87efecdb20b..6a8c9b591a5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_28.plan
index 369ff3fa96f..ef6c5bfe3b3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_28.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_28.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_29.plan
index ccf67fb2ad4..226caea7b70 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_29.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_29.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_3.plan
index 32f2192bcdf..effee939061 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_30.plan
index 87efecdb20b..d2f5fa8860a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_30.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_30.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_31.plan
index 32f2192bcdf..13f011b354c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_31.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_31.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_32.plan
index 87efecdb20b..4037080c178 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_32.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_32.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_33.plan
index b15b66d53c8..4303cebc9dc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_33.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_33.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_34.plan
index 87efecdb20b..53ae679ee6a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_34.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_34.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_35.plan
index 87efecdb20b..9af24719af5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_35.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_35.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_36.plan
index 369ff3fa96f..c1ac144f781 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_36.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_36.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_37.plan
index 87efecdb20b..9d3ebd8235a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_37.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_37.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_38.plan
index 87efecdb20b..2f0f4a8bac3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_38.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_38.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_39.plan
index 87efecdb20b..e35ebb3aa28 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_39.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_39.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_4.plan
index 0dacebd60cb..54937ada58d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_40.plan
index 13a49050de6..81e531a0d59 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_40.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_40.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col7 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_41.plan
index 87efecdb20b..8d469f3fce7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_41.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_41.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_42.plan
index 87efecdb20b..f3806edb0a2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_42.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_42.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_43.plan
index 87efecdb20b..d6837df1adb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_43.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_43.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_44.plan
index 32f2192bcdf..47546302927 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_44.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_44.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_45.plan
index 0dacebd60cb..c604dad3ecf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_45.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_45.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_46.plan
index 87efecdb20b..3608f993e55 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_46.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_46.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_47.plan
index ee1d05721c6..23e6c8ec0a0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_47.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_47.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_48.plan
index 87efecdb20b..36b85144abf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_48.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_48.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_49.plan
index 87efecdb20b..45bc739a17f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_49.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_49.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_5.plan
index d69a9cabb87..898b6665d22 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_50.plan
index 87efecdb20b..d5f7cceb2ab 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_50.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_50.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_51.plan
index 87efecdb20b..4b469c5ab4d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_51.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_51.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_52.plan
index 87efecdb20b..1127069badc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_52.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_52.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_53.plan
index 87efecdb20b..d2c2636fed3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_53.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_53.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_54.plan
index bd9dd0bbff8..a72ad3cbbdb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_54.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_54.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_55.plan
index 32f2192bcdf..d448e956814 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_55.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_55.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_56.plan
index 87efecdb20b..bf9a8c2082d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_56.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_56.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_57.plan
index 87efecdb20b..4b469c5ab4d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_57.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_57.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_58.plan
index 87efecdb20b..c407d282eee 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_58.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_58.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_59.plan
index 87efecdb20b..4aea89cb1dd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_59.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_59.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_6.plan
index 369ff3fa96f..6d5d95ab07e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_60.plan
index 32f2192bcdf..d86c6ad2cdb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_60.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_60.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_61.plan
index 87efecdb20b..16e733cabb9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_61.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_61.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_62.plan
index 87efecdb20b..9f2a15cb039 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_62.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_62.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_63.plan
index 87efecdb20b..c8193af4e50 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_63.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_63.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_64.plan
index 87efecdb20b..a3e660627a4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_64.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_64.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_65.plan
index 32f2192bcdf..d1d1aff0d8d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_65.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_65.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_66.plan
index 72a43885784..5c65a0422f8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_66.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_66.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_67.plan
index 369ff3fa96f..10901ec2314 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_67.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_67.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_68.plan
index 87efecdb20b..4247be9f3e8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_68.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_68.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_69.plan
index 87efecdb20b..f073307f0fa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_69.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_69.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_7.plan
index 369ff3fa96f..164b72f9817 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_70.plan
index 87efecdb20b..61eb9d1938c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_70.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_70.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_71.plan
index 87efecdb20b..eeeffb5a3e4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_71.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_71.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_72.plan
index 87efecdb20b..fb0d2b9fd88 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_72.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_72.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_73.plan
index 87efecdb20b..66ae85d93fb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_73.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_73.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_74.plan
index 87efecdb20b..e3a2df5826b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_74.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_74.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_75.plan
index 87efecdb20b..dacb4886992 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_75.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_75.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_76.plan
index 87efecdb20b..f262b6c9c74 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_76.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_76.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_77.plan
index 369ff3fa96f..92bdfa4462f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_77.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_77.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_78.plan
index 87efecdb20b..28fcd54bf6b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_78.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_78.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_79.plan
index 87efecdb20b..c5b2af4ceab 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_79.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_79.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_8.plan
index 87efecdb20b..986bbe62151 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_80.plan
index 87efecdb20b..2be5bc5564e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_80.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_80.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_81.plan
index 32f2192bcdf..8a546abbc38 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_81.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_81.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_82.plan
index 87efecdb20b..b8748a75f6a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_82.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_82.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_83.plan
index 369ff3fa96f..eb76305d978 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_83.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_83.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_84.plan
index 32f2192bcdf..5e9de5b66a1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_84.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_84.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_85.plan
index 87efecdb20b..47e686944cf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_85.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_85.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_86.plan
index 87efecdb20b..b84b970352c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_86.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_86.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_87.plan
index d6b2664628f..13868c6ce39 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_87.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_87.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_88.plan
index 9978972394e..5de6629d623 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_88.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_88.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_89.plan
index 32f2192bcdf..69b4299ed6c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_89.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_89.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_9.plan
index 87efecdb20b..daab7f48a43 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_90.plan
index 32f2192bcdf..5ceae4e349d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_90.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_90.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_91.plan
index 13a49050de6..a7261d688b5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_91.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_91.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_92.plan
index 87efecdb20b..487ba543066 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_92.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_92.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_93.plan
index 87efecdb20b..44133179d03 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_93.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_93.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_94.plan
index 87efecdb20b..252dcb22971 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_94.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_94.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_95.plan
index 32f2192bcdf..f98f1e496a5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_95.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_95.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_96.plan
index 369ff3fa96f..f0c43bcea8f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_96.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_96.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_97.plan
index 87efecdb20b..2511b5a663c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_97.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_97.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_98.plan
index 13a49050de6..fda6e6afc72 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_98.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_98.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_99.plan
index 87efecdb20b..b4724b3446b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_99.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_99.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_1.plan
index ba982a89bb4..b761a25402f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_10.plan
index cb723211e50..153e4f833f1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_11.plan
index 4f3b6336093..90be7473cc4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-5.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_12.plan
index ba982a89bb4..fafc59d8abf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_13.plan
index ba982a89bb4..42967b7989d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_14.plan
index ba982a89bb4..d2e01a3300a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_15.plan
index ba982a89bb4..1ba573bc41e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_16.plan
index e52f33a3fc2..59223cd233e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_17.plan
index ba982a89bb4..fcc46446699 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_18.plan
index ba982a89bb4..bba9299eb93 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_19.plan
index ba982a89bb4..979492d22e8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_2.plan
index ba982a89bb4..58aa49aec20 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_20.plan
index ba982a89bb4..95ea7f8cacb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_21.plan
index 42fa351eb76..16d9431cbcc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_22.plan
index 7be8f99c2ab..e9b39e760e1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_23.plan
index ba982a89bb4..c86608b365b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_24.plan
index 05300fa870d..5995e66bfc8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-5.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_25.plan
index ba982a89bb4..5f3b0ad9f1b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_26.plan
index 4f3b6336093..d1c110407a0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-5.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_27.plan
index 1ea32c03166..6b2f55864ff 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_28.plan
index ba982a89bb4..f5efb284bc5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_28.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_28.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_29.plan
index 4f3b6336093..607237e7a67 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_29.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_29.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-5.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_3.plan
index cb723211e50..02687442e8b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_30.plan
index 4f3b6336093..c923c133c41 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_30.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_30.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-5.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_31.plan
index ba982a89bb4..91a3f7de900 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_31.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_31.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_32.plan
index ba982a89bb4..6ba7090c06c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_32.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_32.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_33.plan
index ba982a89bb4..376cdacdf1c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_33.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_33.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_34.plan
index 4f3b6336093..669ae97fdd4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_34.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_34.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-5.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_35.plan
index ba982a89bb4..5ddd2956bab 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_35.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_35.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_36.plan
index e52f33a3fc2..6bbe622b708 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_36.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_36.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_37.plan
index ba982a89bb4..108437e6659 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_37.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_37.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_38.plan
index ba982a89bb4..5d028a0bcbe 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_38.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_38.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_39.plan
index ba982a89bb4..1ea098d6b7c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_39.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_39.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_4.plan
index ba982a89bb4..1da605c0fdc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_5.plan
index 42fa351eb76..ba6dfc707f7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_6.plan
index ba982a89bb4..8faf5f19711 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_7.plan
index ba982a89bb4..050a6c000a9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_8.plan
index 4f3b6336093..2607a1f1618 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select1-5.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_9.plan
index ba982a89bb4..1ea098d6b7c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select1-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select1-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select1-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_1.plan
index 221964e8ae5..799cb0c0dac 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_10.plan
index e8d313ca772..fb3b22a533a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_100.plan
index 3a32ff1ab88..5acb7929c83 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_100.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_100.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or Not\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_101.plan
index 2cf5aae9289..d9ba80068cf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_101.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_101.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or Exist(items1)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_102.plan
index 30a990f6217..67c583ce59a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_102.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_102.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_103.plan
index 3a32ff1ab88..310e96ce3ed 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_103.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_103.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_104.plan
index 30ba1e8eb6b..ef95d47abd1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_104.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_104.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_105.plan
index 014b069e58c..08aa8d67ef9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_105.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_105.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or Exist(items0) Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_106.plan
index 3a32ff1ab88..eac86e519b8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_106.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_106.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_107.plan
index 221964e8ae5..799cb0c0dac 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_107.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_107.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_108.plan
index 1e53e3eaa3a..9233d980593 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_108.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_108.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_109.plan
index e8d313ca772..fe51e57ce7b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_109.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_109.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or Not Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_11.plan
index e8d313ca772..d6a19b36eb2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_110.plan
index 3a32ff1ab88..86c0c637a1d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_110.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_110.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_111.plan
index e8d313ca772..a7ee42156d0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_111.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_111.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items0 != 0 Or ... And ... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_112.plan
index 3a32ff1ab88..0a80667d3ec 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_112.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_112.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_113.plan
index 3a32ff1ab88..c0557b671e2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_113.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_113.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items1) Or ... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_114.plan
index 2cf5aae9289..4f639c2e053 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_114.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_114.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_115.plan
index 3a32ff1ab88..7565cddb75a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_115.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_115.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_116.plan
index e8d313ca772..9f27ed32903 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_116.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_116.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_117.plan
index 3a32ff1ab88..ceffa9dff0d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_117.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_117.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_118.plan
index 2cf5aae9289..edb8f9b5cb1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_118.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_118.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_119.plan
index 3a32ff1ab88..f4bbc551952 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_119.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_119.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or Not\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_12.plan
index 3a32ff1ab88..b61aa4e4285 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items0 != 0 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_120.plan
index a6f9a33af40..c28fa9ea356 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_120.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_120.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_121.plan
index 3a32ff1ab88..54e90403b73 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_121.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_121.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_122.plan
index e8d313ca772..84ff6d73290 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_122.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_122.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_123.plan
index 3a32ff1ab88..ad18132a511 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_123.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_123.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_124.plan
index 3a32ff1ab88..8212f030e89 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_124.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_124.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_125.plan
index 94a90654684..5c62c72909c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_125.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_125.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (n\\/a)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":6,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Stage\",\n                  \"PlanNodeId\":5\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_0_1\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_1\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Inputs\":\n                                      [\n                                        1,\n                                        2\n                                      ],\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (n\\/a)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_126.plan
index 3a32ff1ab88..f370b9355d3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_126.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_126.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_127.plan
index 3a32ff1ab88..506e9061267 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_127.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_127.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_128.plan
index 61de6dd5cbb..07762be9898 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_128.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_128.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_129.plan
index 3a32ff1ab88..154a733d24d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_129.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_129.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_13.plan
index 3a32ff1ab88..4351a49827d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items1) And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_130.plan
index 3a32ff1ab88..055a3ebd5a0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_130.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_130.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_131.plan
index 3a32ff1ab88..db1524cd270 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_131.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_131.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_132.plan
index f3a883ecffd..3d7aa7b7ba0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_132.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_132.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_133.plan
index 7b97c40b405..25c3bd119a9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_133.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_133.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_134.plan
index 3a32ff1ab88..affd8df8cfc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_134.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_134.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_135.plan
index 3a32ff1ab88..381550c3995 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_135.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_135.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_136.plan
index 4ce1440478c..5c9ec5560a2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_136.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_136.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_137.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_137.plan
index 1824613f62f..c4ee5459983 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_137.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_137.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_14.plan
index 3a32ff1ab88..1cfec0137f6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_15.plan
index 94a90654684..62f8655a1c9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (n\\/a)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":6,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Stage\",\n                  \"PlanNodeId\":5\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_0_1\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_1\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Inputs\":\n                                      [\n                                        1,\n                                        2\n                                      ],\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (n\\/a)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_16.plan
index 3a32ff1ab88..f21476be641 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_17.plan
index 3a32ff1ab88..111d4d58dd4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items1)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_18.plan
index 3a32ff1ab88..cfa9c534260 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items1) Or items0 != 0 Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_19.plan
index 30a990f6217..7df7e412a55 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_2.plan
index 3a32ff1ab88..4bf10e01a7e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_20.plan
index e8d313ca772..20858ec4696 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_21.plan
index 2cf5aae9289..0196cee2024 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_22.plan
index 34e57d70aaf..ea2a1c5c668 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_23.plan
index 3a32ff1ab88..fea7054f605 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_24.plan
index 3a32ff1ab88..506e9061267 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_25.plan
index 94a90654684..7044f69e105 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (n\\/a)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":6,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Stage\",\n                  \"PlanNodeId\":5\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_0_1\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_1\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Inputs\":\n                                      [\n                                        1,\n                                        2\n                                      ],\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (n\\/a)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_26.plan
index 3a32ff1ab88..b9b53487200 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_27.plan
index 3a32ff1ab88..db0f0d9a74e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_28.plan
index 61de6dd5cbb..9aba6a07f39 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_28.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_28.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_29.plan
index e8d313ca772..675b7249b94 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_29.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_29.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_3.plan
index 3a32ff1ab88..e3572511714 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_30.plan
index c9060c54640..5e4dbc4bb7d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_30.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_30.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_31.plan
index 3a32ff1ab88..e4e7f93000d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_31.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_31.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_32.plan
index 3a32ff1ab88..88daa81b3db 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_32.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_32.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_33.plan
index 30a990f6217..dbace0bcb24 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_33.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_33.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_34.plan
index 3a32ff1ab88..d0f059db800 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_34.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_34.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_35.plan
index ef9dd904ecf..803f4d26e91 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_35.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_35.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_36.plan
index 2cf5aae9289..c5dc606fb8b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_36.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_36.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_37.plan
index 3a32ff1ab88..99f7a1513db 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_37.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_37.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And Exist(items1) And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_38.plan
index 7b97c40b405..3d7aa0bae3b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_38.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_38.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_39.plan
index 3a32ff1ab88..5c0e3264547 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_39.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_39.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_4.plan
index ca16b856e7e..d6aa80967f0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_40.plan
index e8d313ca772..a2259030928 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_40.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_40.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And items0 != 0\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_41.plan
index 3a32ff1ab88..cbabaf5e406 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_41.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_41.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_42.plan
index c9060c54640..9b1251b42b4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_42.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_42.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_43.plan
index 3a32ff1ab88..1d9e9b65b0a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_43.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_43.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ... Or Not\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_44.plan
index 3a32ff1ab88..b93e18bcff9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_44.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_44.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_45.plan
index 3a32ff1ab88..a2f5a7ba37b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_45.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_45.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or Exist(items1)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_46.plan
index 3a32ff1ab88..295a808325e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_46.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_46.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_47.plan
index 014b069e58c..44ec3be8842 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_47.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_47.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items0)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_48.plan
index e8d313ca772..451382dd5cf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_48.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_48.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_49.plan
index 3a32ff1ab88..75063016d80 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_49.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_49.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_5.plan
index 30ba1e8eb6b..8d722eedda4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And Exist(items1) And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_50.plan
index 7f06d903ac3..f65f361b01c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_50.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_50.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_51.plan
index e8d313ca772..a683ee2bc8f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_51.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_51.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_52.plan
index e8d313ca772..0c77967a1e2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_52.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_52.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_53.plan
index 2cf5aae9289..788bb360f1c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_53.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_53.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_54.plan
index 3a32ff1ab88..1789de4eea0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_54.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_54.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_55.plan
index 3a32ff1ab88..db1524cd270 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_55.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_55.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_56.plan
index a1004ce81a1..303aea7bd26 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_56.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_56.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_57.plan
index dc04a884325..faf8b59e28a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_57.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_57.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_58.plan
index 34e57d70aaf..069de929d39 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_58.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_58.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_59.plan
index 3a32ff1ab88..89412480406 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_59.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_59.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_6.plan
index 3a32ff1ab88..5b300efd9f6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_60.plan
index 1824613f62f..67e9274ca92 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_60.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_60.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_61.plan
index 3a32ff1ab88..0a0c7477a13 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_61.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_61.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or Exist(items1)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_62.plan
index 2cf5aae9289..0bbf6abe0bf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_62.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_62.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_63.plan
index 3a32ff1ab88..53338d57fef 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_63.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_63.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_64.plan
index 7b97c40b405..a099bb07b9f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_64.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_64.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_65.plan
index e8d313ca772..0be4d10b95f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_65.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_65.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"Exist(items1)\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_66.plan
index 3a32ff1ab88..92cb7780250 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_66.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_66.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_67.plan
index 3a32ff1ab88..c9717783e70 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_67.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_67.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items1) And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_68.plan
index 3a32ff1ab88..a696a8ef3b5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_68.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_68.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or Not\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_69.plan
index f3a883ecffd..76fe8091779 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_69.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_69.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_7.plan
index 3a32ff1ab88..e069c8c8105 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0 Or ... Or Exist(items1)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_70.plan
index 2cf5aae9289..e0bcdd74b7d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_70.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_70.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_71.plan
index 3a32ff1ab88..c48108abf5d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_71.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_71.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items1) Or ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_72.plan
index 3a32ff1ab88..5581364b73b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_72.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_72.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_73.plan
index 3a32ff1ab88..2ec4dab8906 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_73.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_73.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_74.plan
index c9060c54640..1d287ed6c02 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_74.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_74.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_75.plan
index 94a90654684..642317d9bbb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_75.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_75.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (n\\/a)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":6,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Stage\",\n                  \"PlanNodeId\":5\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_0_1\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_1\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Inputs\":\n                                      [\n                                        1,\n                                        2\n                                      ],\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (n\\/a)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_76.plan
index 2cf5aae9289..e64704cff6d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_76.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_76.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_77.plan
index 3a32ff1ab88..7945731bbd4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_77.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_77.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_78.plan
index c9060c54640..453f939b3b9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_78.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_78.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_79.plan
index 3a32ff1ab88..0da48e58e2e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_79.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_79.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_8.plan
index e8d313ca772..c9be685236a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_80.plan
index 3a32ff1ab88..81cc52b28f3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_80.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_80.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_81.plan
index 3a32ff1ab88..496e78914f9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_81.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_81.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_82.plan
index 3a32ff1ab88..42253ebf991 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_82.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_82.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0 And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_83.plan
index 30ba1e8eb6b..64f50e352dd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_83.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_83.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_84.plan
index 3a32ff1ab88..777ea570f78 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_84.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_84.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_85.plan
index 4ce1440478c..ba61a1822ff 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_85.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_85.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_86.plan
index 2cf5aae9289..ba36e2d87a1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_86.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_86.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And Exist(items1) And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_87.plan
index 3a32ff1ab88..8adefe3db86 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_87.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_87.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And Exist(items1) And items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_88.plan
index 5b8d52dc8aa..a25834a33c7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_88.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_88.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_89.plan
index e8d313ca772..bfc9cbecbda 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_89.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_89.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_9.plan
index 3a32ff1ab88..c71acfb3453 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0 Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_90.plan
index 3a32ff1ab88..4b39e9bb503 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_90.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_90.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_91.plan
index 1824613f62f..8e2b5836a74 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_91.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_91.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_92.plan
index f3a883ecffd..02a96703170 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_92.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_92.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_93.plan
index 3a32ff1ab88..4ebb716c773 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_93.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_93.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_94.plan
index e8d313ca772..17d5921e7d2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_94.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_94.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_95.plan
index 3a32ff1ab88..88daa81b3db 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_95.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_95.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_96.plan
index 3a32ff1ab88..d92c052719e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_96.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_96.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_97.plan
index 3a32ff1ab88..0da48e58e2e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_97.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_97.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_98.plan
index 3a32ff1ab88..d4aba94f0ba 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_98.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_98.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_99.plan
index 3a32ff1ab88..f5fb6d2c3c3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_99.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_99.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_1.plan
index 47c594b76fa..bf93a3d0372 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_10.plan
index e300591defa..fff708bed6d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_100.plan
index c15b236efdc..5bf95496423 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_100.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_100.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_101.plan
index 639ec426499..a123e0647d9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_101.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_101.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_102.plan
index 47c594b76fa..95a680a1409 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_102.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_102.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_103.plan
index e300591defa..bdc4943dbaf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_103.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_103.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_104.plan
index cd61a8b17ff..cd642411373 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_104.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_104.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_105.plan
index cd61a8b17ff..3b8422c1c4c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_105.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_105.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And Exist(items1)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_106.plan
index e300591defa..c8f4bcf578f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_106.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_106.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_107.plan
index e300591defa..75e10327e54 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_107.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_107.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_108.plan
index e35d50a2149..d92968dceac 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_108.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_108.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 \\u003C 110 Or items2 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_109.plan
index e300591defa..71d59c33d72 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_109.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_109.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_11.plan
index e300591defa..48f8ed1ef3d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And Exist(items1)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_110.plan
index e300591defa..076be34a423 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_110.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_110.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_111.plan
index cd61a8b17ff..b85163f9092 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_111.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_111.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items1) And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_112.plan
index e300591defa..6efd36b14d9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_112.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_112.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_113.plan
index cd61a8b17ff..8859153301d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_113.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_113.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_114.plan
index 1f93fdcdcc2..dd0d4be07fe 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_114.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_114.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_115.plan
index e300591defa..67dcf1511d2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_115.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_115.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_116.plan
index e300591defa..575a1de33d4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_116.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_116.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_117.plan
index e300591defa..f9a5c916dbf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_117.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_117.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_118.plan
index e300591defa..c5fb12b7ee0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_118.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_118.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_119.plan
index 47c594b76fa..bcae61d33fb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_119.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_119.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_12.plan
index e300591defa..4ac49b25d91 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_120.plan
index e300591defa..631eee75f65 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_120.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_120.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_121.plan
index 47c594b76fa..3c139b1fffe 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_121.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_121.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_122.plan
index c4d28d9e2b9..ea97fa97f17 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_122.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_122.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items0) Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_123.plan
index e300591defa..575a1de33d4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_123.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_123.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_124.plan
index a749fbdffc1..a9e3e81a7c4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_124.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_124.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_125.plan
index f062d157cfe..4a3b358acc4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_125.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_125.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_126.plan
index e300591defa..274a2953ab0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_126.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_126.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_127.plan
index 47c594b76fa..4b3e222a578 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_127.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_127.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And Exist(items1) And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_128.plan
index e300591defa..4e9e00b76a8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_128.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_128.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items1) And ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_129.plan
index e300591defa..fe15c3bf224 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_129.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_129.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_13.plan
index e300591defa..d78f9f85096 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_130.plan
index cd61a8b17ff..5151e1ee30e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_130.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_130.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_131.plan
index e300591defa..ce858e7121a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_131.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_131.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_132.plan
index e300591defa..96a7a0ef945 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_132.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_132.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_133.plan
index 180ef3181d7..602925a59c4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_133.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_133.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_134.plan
index e2d2dc89ce2..3d5a28f1395 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_134.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_134.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_135.plan
index e300591defa..5b580f4894e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_135.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_135.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_136.plan
index e300591defa..bcedceddc82 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_136.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_136.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0 Or ... Or ... Or Not\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_137.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_137.plan
index 47c594b76fa..bfcaace0e27 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_137.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_137.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_138.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_138.plan
index e300591defa..8e1a9a066a6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_138.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_138.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_139.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_139.plan
index 47c594b76fa..0faac152c3a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_139.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_139.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And items3 \\u003C 110 Or items3 \\u003E 150 And items0 != 0\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_14.plan
index e300591defa..1c1d4905cd0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_140.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_140.plan
index e9642224f8b..033a3601f52 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_140.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_140.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_141.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_141.plan
index e300591defa..ce858e7121a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_141.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_141.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_142.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_142.plan
index e300591defa..61a152cb96e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_142.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_142.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0 And ... And ... And Exist(items1)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_143.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_143.plan
index 47c594b76fa..72feb3a6ffd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_143.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_143.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And items0 != 0\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_144.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_144.plan
index e300591defa..607e641fd74 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_144.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_144.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items1) And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_145.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_145.plan
index e300591defa..14147a7c200 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_145.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_145.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_146.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_146.plan
index 49b423bd223..6b5f2c0935b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_146.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_146.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_147.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_147.plan
index cd61a8b17ff..bffc1ecd81f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_147.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_147.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_148.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_148.plan
index e300591defa..274a2953ab0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_148.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_148.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_149.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_149.plan
index e300591defa..47e766c7bfb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_149.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_149.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Not Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_15.plan
index cd61a8b17ff..9ae5a3f3794 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_150.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_150.plan
index e300591defa..47eccd41f25 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_150.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_150.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And Exist(items1)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_151.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_151.plan
index 6fd548eae41..5b9c467bfcc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_151.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_151.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_152.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_152.plan
index e300591defa..f91f5c8bd59 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_152.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_152.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items1) Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_153.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_153.plan
index e300591defa..575a1de33d4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_153.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_153.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_154.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_154.plan
index e300591defa..31751a9b592 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_154.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_154.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_155.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_155.plan
index 47c594b76fa..70657444daa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_155.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_155.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_156.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_156.plan
index cd61a8b17ff..c4320bbfce2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_156.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_156.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_157.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_157.plan
index 180ef3181d7..00262a739ff 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_157.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_157.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_158.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_158.plan
index e300591defa..63c83af383a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_158.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_158.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_16.plan
index cd61a8b17ff..45bd67171e5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_17.plan
index e300591defa..fa42e3f4cae 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_18.plan
index e300591defa..f79585c9181 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_19.plan
index e300591defa..0b41e3df45b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_2.plan
index 47c594b76fa..f9140267ea4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items0 != 0 And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_20.plan
index 81f5ea96d4f..796335ffcd4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_21.plan
index e300591defa..2e64ee473fe 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_22.plan
index e300591defa..b5a93503118 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_23.plan
index e300591defa..4a5ec965db3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_24.plan
index a749fbdffc1..cbf238a77c5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_25.plan
index 47c594b76fa..c2daf88ca45 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_26.plan
index e300591defa..1a0124999a8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_27.plan
index e300591defa..35d6bc78a6b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_28.plan
index e300591defa..9a7d96ab0d6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_28.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_28.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_29.plan
index e300591defa..ca9c42bab12 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_29.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_29.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items1) And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_3.plan
index e300591defa..9a6200aff58 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or Not\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_30.plan
index 23cafd5558a..cecd7798512 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_30.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_30.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_31.plan
index cd61a8b17ff..edd5c8a9fe8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_31.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_31.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_32.plan
index e300591defa..4dbc0b60cc3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_32.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_32.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_33.plan
index 5c8428669da..cf8fd986f70 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_33.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_33.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_34.plan
index e300591defa..296337f7eeb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_34.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_34.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items0 != 0 And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_35.plan
index e300591defa..a63d7a1d16f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_35.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_35.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_36.plan
index e300591defa..2e6ba0fc134 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_36.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_36.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_37.plan
index 23cafd5558a..cecd7798512 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_37.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_37.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_38.plan
index 180ef3181d7..0f89bd7dbec 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_38.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_38.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_39.plan
index cd61a8b17ff..c71f54982d6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_39.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_39.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_4.plan
index 47c594b76fa..b0b990f45d2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_40.plan
index 47c594b76fa..767e0e1473a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_40.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_40.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"Not Or ... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_41.plan
index e300591defa..def74bd150f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_41.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_41.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items0 != 0 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_42.plan
index e300591defa..55a64a0b3fa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_42.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_42.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_43.plan
index e300591defa..79cbd035b8c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_43.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_43.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_44.plan
index e9642224f8b..b4b04e58d6f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_44.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_44.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_45.plan
index e300591defa..803d44b2b90 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_45.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_45.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_46.plan
index e2d2dc89ce2..0e0f3cf232e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_46.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_46.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_47.plan
index e300591defa..575a1de33d4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_47.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_47.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_48.plan
index e2d2dc89ce2..e8dafd1a2af 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_48.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_48.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_49.plan
index e300591defa..e947817955c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_49.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_49.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or Not Or Exist(items1)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_5.plan
index fe49b295945..ca1d72c0b29 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_50.plan
index e300591defa..86dba975bcc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_50.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_50.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or Not Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_51.plan
index e300591defa..491d2bfc765 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_51.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_51.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items1) Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_52.plan
index e2d2dc89ce2..0156fe0f794 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_52.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_52.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_53.plan
index e300591defa..2bfd1d1a649 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_53.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_53.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_54.plan
index e300591defa..5d2b2421b89 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_54.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_54.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And Exist(items1)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_55.plan
index 47c594b76fa..82715eb9eda 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_55.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_55.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_56.plan
index e300591defa..c3537a40022 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_56.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_56.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_57.plan
index 47c594b76fa..ad794c1eccd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_57.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_57.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_58.plan
index e300591defa..2ec58d0e977 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_58.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_58.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_59.plan
index e300591defa..d7a5f53a15a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_59.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_59.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_6.plan
index cd61a8b17ff..eb932eef6e0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_60.plan
index e300591defa..6600f03d5ed 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_60.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_60.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_61.plan
index d978c5ec2cc..8c224e008a5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_61.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_61.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or Not\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_62.plan
index c15b236efdc..07b4b95c774 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_62.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_62.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_63.plan
index e300591defa..4c55e64b8fd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_63.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_63.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_64.plan
index e300591defa..fba6294fc1d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_64.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_64.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_65.plan
index e300591defa..45894d2946a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_65.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_65.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_66.plan
index e300591defa..7d07890bfc1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_66.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_66.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_67.plan
index 47c594b76fa..a8f1245e83f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_67.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_67.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_68.plan
index e300591defa..9b2debc7a40 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_68.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_68.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Not Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_69.plan
index e300591defa..f4e2f107b7f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_69.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_69.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_7.plan
index e300591defa..9ba47d51a73 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_70.plan
index e300591defa..9ba357abb44 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_70.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_70.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_71.plan
index e300591defa..d5845d9e61f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_71.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_71.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_72.plan
index e2d2dc89ce2..c1956a752cc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_72.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_72.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_73.plan
index e300591defa..7435db9bb9d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_73.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_73.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_74.plan
index e9642224f8b..c1030cf72ee 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_74.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_74.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_75.plan
index 180ef3181d7..81be86f80bb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_75.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_75.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_76.plan
index cd61a8b17ff..f992a719986 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_76.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_76.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_77.plan
index d978c5ec2cc..ec854a938e3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_77.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_77.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_78.plan
index cd61a8b17ff..082f32d94b2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_78.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_78.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_79.plan
index e35d50a2149..8fab835d890 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_79.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_79.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_8.plan
index dd44f918ec7..326bea28b14 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_80.plan
index cd61a8b17ff..905a564dd8e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_80.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_80.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_81.plan
index e300591defa..9a66c3e8775 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_81.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_81.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_82.plan
index e300591defa..2a64d5d970b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_82.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_82.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_83.plan
index e9642224f8b..033a3601f52 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_83.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_83.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_84.plan
index e2d2dc89ce2..4f047a7317d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_84.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_84.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0 And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_85.plan
index 47c594b76fa..ea05268f515 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_85.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_85.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_86.plan
index e300591defa..46b1a1dfc65 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_86.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_86.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_87.plan
index e300591defa..bd9ca837164 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_87.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_87.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0 Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_88.plan
index e300591defa..712e2c2ac96 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_88.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_88.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_89.plan
index 47c594b76fa..f6419cad52f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_89.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_89.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... And ... Or Exist(items1)\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_9.plan
index e300591defa..fc26db21747 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items1)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_90.plan
index e300591defa..a42f9e4e7b7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_90.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_90.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_91.plan
index 47c594b76fa..a10fa5f0a97 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_91.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_91.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_92.plan
index e300591defa..a650816dafc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_92.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_92.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_93.plan
index e300591defa..bd0b49b9a65 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_93.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_93.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_94.plan
index e300591defa..8a654ce1e61 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_94.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_94.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_95.plan
index e300591defa..c5883c07068 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_95.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_95.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Not Or items0 != 0 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_96.plan
index e300591defa..2703398b6ca 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_96.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_96.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_97.plan
index 47c594b76fa..b5ee962aefe 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_97.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_97.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_98.plan
index 180ef3181d7..cfda5eacc0f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_98.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_98.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_99.plan
index 0ad6e8c4bb6..1672428163b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_99.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_99.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_1.plan
index 33ac16409d5..d90a986066c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_10.plan
index 4a0406e7390..4f62f952c7f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_100.plan
index 33ac16409d5..92eec62eded 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_100.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_100.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_101.plan
index 33ac16409d5..389a4f3dbfe 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_101.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_101.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_102.plan
index 9945c7b3ca4..d155fd70717 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_102.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_102.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_103.plan
index 33ac16409d5..f1714cede58 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_103.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_103.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_104.plan
index a7615ed4ca0..7e31e7db2ae 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_104.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_104.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_105.plan
index 33ac16409d5..362cc24bb79 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_105.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_105.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_106.plan
index 5baf747e858..765f845a9f1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_106.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_106.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_107.plan
index 4a0406e7390..9689ea9a027 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_107.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_107.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"Exist(items1) Or ... And ... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_108.plan
index 33ac16409d5..e5997e34eec 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_108.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_108.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0 And ... And Exist(items1)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_109.plan
index 2d4741065b5..ed743c1305f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_109.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_109.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_11.plan
index 1ef6b8ea85f..77309017163 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 \\u003C 110 Or items2 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_110.plan
index 33ac16409d5..71ff2929fde 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_110.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_110.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And Exist(items1)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_111.plan
index 80ed110576a..16069cacb92 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_111.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_111.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_112.plan
index 4a0406e7390..7e2f77a5f38 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_112.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_112.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_113.plan
index 33ac16409d5..88fee6cd7d4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_113.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_113.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items1) And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_114.plan
index 4a0406e7390..f202206b2b4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_114.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_114.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or items0 != 0\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_115.plan
index b2128d446f3..2c1635da693 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_115.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_115.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_116.plan
index 33ac16409d5..b6bef6b9e0c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_116.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_116.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_117.plan
index 4a0406e7390..a7b60ac153c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_117.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_117.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_118.plan
index 33ac16409d5..65a0223f215 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_118.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_118.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_119.plan
index 33ac16409d5..4a89bb1687c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_119.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_119.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And Exist(items1) And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_12.plan
index 33ac16409d5..81416c8b1fb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_120.plan
index 1fd6152e1b8..117199edcf5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_120.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_120.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_121.plan
index 1ef6b8ea85f..f487b126a5a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_121.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_121.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_122.plan
index 090d605d9fe..88a4011647a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_122.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_122.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_123.plan
index 33ac16409d5..2ff536afa8f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_123.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_123.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_124.plan
index 1fd6152e1b8..e303df829a4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_124.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_124.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_125.plan
index 33ac16409d5..51e8ba638e4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_125.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_125.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_126.plan
index 33ac16409d5..72537643634 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_126.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_126.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_127.plan
index 1fd6152e1b8..c63ea822f20 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_127.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_127.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_128.plan
index 33ac16409d5..74431d77d2a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_128.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_128.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_129.plan
index 33ac16409d5..3302e7962ba 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_129.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_129.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_13.plan
index 4a0406e7390..f29d4e544d5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_130.plan
index 33ac16409d5..99144b3be74 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_130.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_130.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0 And ... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_131.plan
index 33ac16409d5..2a722a73a5f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_131.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_131.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_132.plan
index 33ac16409d5..da72e821334 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_132.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_132.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_133.plan
index 33ac16409d5..86bc63e69b1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_133.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_133.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_134.plan
index 33ac16409d5..8ae92e66255 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_134.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_134.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_135.plan
index 4a0406e7390..db50c21e7ef 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_135.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_135.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"Exist(items1) And items0 != 0\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_136.plan
index a7615ed4ca0..c45b32b87e0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_136.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_136.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or Exist(items0)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_137.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_137.plan
index 33ac16409d5..50a059ace46 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_137.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_137.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_138.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_138.plan
index 33ac16409d5..4749fb9ff7d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_138.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_138.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_139.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_139.plan
index 33ac16409d5..e9dd55da209 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_139.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_139.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_14.plan
index 33ac16409d5..dcddb67dfb7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_140.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_140.plan
index 4a0406e7390..ea7138c084b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_140.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_140.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or Not Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_141.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_141.plan
index 33ac16409d5..2f1ac1b675e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_141.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_141.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_142.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_142.plan
index 33ac16409d5..644273029fc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_142.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_142.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_143.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_143.plan
index 33ac16409d5..402826c1303 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_143.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_143.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_144.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_144.plan
index 80ed110576a..d0cdfeb2fd3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_144.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_144.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_145.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_145.plan
index 80ed110576a..17d242dfb55 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_145.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_145.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_146.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_146.plan
index 33ac16409d5..92eec62eded 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_146.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_146.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_147.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_147.plan
index 4a0406e7390..b1ca7f45733 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_147.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_147.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_15.plan
index 33ac16409d5..a9979827a6f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_16.plan
index 33ac16409d5..a48306d193f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_17.plan
index 4a0406e7390..c3a60c8851d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_18.plan
index 33ac16409d5..a049b684774 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Not Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_19.plan
index 33ac16409d5..fd45a312b0c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0 Or Not Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_2.plan
index 4a0406e7390..742ca88f9f0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_20.plan
index 33ac16409d5..fccef952e95 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_21.plan
index 33ac16409d5..b7e20b7af46 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_22.plan
index 33ac16409d5..ee0fdd11144 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items1) And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_23.plan
index 33ac16409d5..b558aff72bb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_24.plan
index a20f7fb2eb5..e54d76029f4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (n\\/a)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":6,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Stage\",\n                  \"PlanNodeId\":5\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_0_1\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_1\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Inputs\":\n                                      [\n                                        1,\n                                        2\n                                      ],\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (n\\/a)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_25.plan
index 33ac16409d5..0506bfab685 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0 And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_26.plan
index 33ac16409d5..52758ffc1a1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Not Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_27.plan
index 80ed110576a..e0f2db11a2d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_28.plan
index 33ac16409d5..0424d090532 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_28.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_28.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0 And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_29.plan
index 2a5b38e1049..dc679e2d86e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_29.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_29.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_3.plan
index 33ac16409d5..607bec71272 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_30.plan
index 9fca4db948e..6acab7d5315 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_30.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_30.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items0)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_31.plan
index c87e8474501..d398fe0ea5e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_31.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_31.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_32.plan
index 33ac16409d5..aa577e0abc1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_32.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_32.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_33.plan
index 1ef6b8ea85f..8ebfc2c13ec 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_33.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_33.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_34.plan
index 33ac16409d5..078e878ec1d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_34.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_34.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_35.plan
index 33ac16409d5..607bec71272 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_35.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_35.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_36.plan
index 33ac16409d5..3dc79a03db1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_36.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_36.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_37.plan
index 33ac16409d5..aaba9ab14b5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_37.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_37.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_38.plan
index 8f77458e4c5..5855210ab52 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_38.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_38.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 \\u003C 110 Or items2 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_39.plan
index 1fd6152e1b8..4609c590210 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_39.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_39.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_4.plan
index 33ac16409d5..f17f2a102f5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_40.plan
index d44e10abf33..563ff75c5f5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_40.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_40.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_41.plan
index 33ac16409d5..8764aa24aef 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_41.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_41.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_42.plan
index 33ac16409d5..4f7d0cef75a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_42.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_42.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_43.plan
index 33ac16409d5..03dda8b8394 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_43.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_43.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_44.plan
index 4a0406e7390..809c4081876 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_44.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_44.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_45.plan
index 33ac16409d5..6c3089546c2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_45.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_45.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_46.plan
index 1b48d2694fb..1e510dda6cd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_46.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_46.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_47.plan
index 33ac16409d5..d8d780cd103 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_47.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_47.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_48.plan
index 4a0406e7390..cffd2e2409c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_48.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_48.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_49.plan
index 9c85c59e2e0..cb7a49d2028 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_49.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_49.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_5.plan
index 4a0406e7390..80576bddbd1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_50.plan
index 33ac16409d5..a085e156234 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_50.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_50.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_51.plan
index fa55e57c594..552585e4224 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_51.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_51.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (n\\/a)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":6,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Stage\",\n                  \"PlanNodeId\":5\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_0_1\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_1\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Inputs\":\n                                      [\n                                        1,\n                                        2\n                                      ],\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (n\\/a)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_52.plan
index 33ac16409d5..9ce78060019 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_52.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_52.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_53.plan
index 33ac16409d5..cecaccf703b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_53.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_53.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_54.plan
index 4a0406e7390..0e9d78ef237 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_54.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_54.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_55.plan
index 33ac16409d5..48ced5c6941 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_55.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_55.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_56.plan
index fb446992a45..533603cc7e0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_56.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_56.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_57.plan
index 33ac16409d5..7f254905585 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_57.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_57.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0 And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_58.plan
index 33ac16409d5..b026edb787b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_58.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_58.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items1) Or ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_59.plan
index 4a0406e7390..c6c7381a91e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_59.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_59.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_6.plan
index dca1b08ffdb..17acafd27f0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_60.plan
index 1fd6152e1b8..3d0a8c45857 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_60.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_60.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items1)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_61.plan
index 33ac16409d5..232f2e34616 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_61.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_61.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_62.plan
index 33ac16409d5..b85b330f1fd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_62.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_62.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_63.plan
index 1fd6152e1b8..e5f2dc7744d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_63.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_63.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_64.plan
index 33ac16409d5..9695c2d2b53 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_64.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_64.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_65.plan
index 090d605d9fe..fb6d314b1ad 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_65.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_65.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_66.plan
index fb446992a45..3d2a7b68791 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_66.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_66.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items1 \\u003C 110 Or items1 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_67.plan
index 33ac16409d5..4294426cb81 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_67.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_67.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_68.plan
index 1fd6152e1b8..d8683ab1545 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_68.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_68.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items1) And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_69.plan
index 80ed110576a..ea2cc6608d4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_69.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_69.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_7.plan
index 10659731e74..a87f2ddef93 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_70.plan
index 80ed110576a..935c4d1f63e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_70.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_70.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... Or Not\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_71.plan
index 33ac16409d5..3e637650e1a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_71.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_71.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_72.plan
index 33ac16409d5..0d7c0727ae5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_72.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_72.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_73.plan
index a7615ed4ca0..6db6dc05104 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_73.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_73.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_74.plan
index 4a0406e7390..fb237c28f64 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_74.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_74.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items0 != 0 And items3 \\u003C 110 Or items3 \\u003E 150 And Exist(items1)\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_75.plan
index 33ac16409d5..3302e7962ba 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_75.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_75.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_76.plan
index 1fd6152e1b8..b5d56df67c9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_76.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_76.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_77.plan
index 33ac16409d5..644273029fc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_77.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_77.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_78.plan
index 4a0406e7390..be9af082482 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_78.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_78.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And items0 != 0\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_79.plan
index 4a0406e7390..62004728bc4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_79.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_79.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_8.plan
index 4a0406e7390..b5db6d2510b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_80.plan
index 9c85c59e2e0..daf10e187a4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_80.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_80.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_81.plan
index 976645fc300..53bb43dc5bc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_81.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_81.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 \\u003C 110 Or items0 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_82.plan
index 4a0406e7390..81a85e9dda7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_82.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_82.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_83.plan
index 33ac16409d5..06cf98a871e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_83.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_83.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_84.plan
index 412c9cbb7b2..ce0bde7c955 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_84.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_84.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_85.plan
index a20f7fb2eb5..90fb252e923 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_85.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_85.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (n\\/a)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":6,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Stage\",\n                  \"PlanNodeId\":5\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_0_1\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_1\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Inputs\":\n                                      [\n                                        1,\n                                        2\n                                      ],\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (n\\/a)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_86.plan
index fb446992a45..9172d96fe52 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_86.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_86.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And items1 \\u003C 110 Or items1 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_87.plan
index 33ac16409d5..36eac2ece9c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_87.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_87.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or Not\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_88.plan
index 33ac16409d5..fb92c87ca15 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_88.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_88.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_89.plan
index 33ac16409d5..dc9f687e5e4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_89.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_89.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or Not\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_9.plan
index 4a0406e7390..536842d19db 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_90.plan
index 9c85c59e2e0..daf10e187a4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_90.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_90.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_91.plan
index 33ac16409d5..b7e20b7af46 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_91.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_91.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_92.plan
index 33ac16409d5..f3c8a519985 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_92.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_92.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_93.plan
index 33ac16409d5..9ce78060019 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_93.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_93.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_94.plan
index 33ac16409d5..607bec71272 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_94.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_94.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_95.plan
index 9945c7b3ca4..a143824a893 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_95.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_95.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_96.plan
index 856cee6e4f6..bf47004dcf8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_96.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_96.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_97.plan
index 33ac16409d5..8815d686436 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_97.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_97.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_98.plan
index 1fd6152e1b8..117199edcf5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_98.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_98.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_99.plan
index 090d605d9fe..88a4011647a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_99.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_99.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_1.plan
index b6cdf5c003f..f52a5fe69f2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_10.plan
index 97d93536dbb..47a1e61cecc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_100.plan
index bf6c1841167..aaf12f56d49 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_100.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_100.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 \\u003C 110 Or items2 \\u003E 150 And Not\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_101.plan
index 7676726f3f4..b99b1dbf92c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_101.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_101.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_102.plan
index a3fd48f6205..ac5758e468c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_102.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_102.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_103.plan
index 0a45c953a13..31fa87cae39 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_103.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_103.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_104.plan
index 7676726f3f4..a0181aa2fb4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_104.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_104.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_105.plan
index b6cdf5c003f..259e24164ac 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_105.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_105.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_106.plan
index b6cdf5c003f..414d0fcfa15 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_106.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_106.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_107.plan
index a3fd48f6205..1cdce5e4156 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_107.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_107.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_108.plan
index b6cdf5c003f..5a7a074c5ea 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_108.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_108.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_109.plan
index b6cdf5c003f..8fdc0a967c2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_109.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_109.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_11.plan
index 7676726f3f4..eee029b1541 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_110.plan
index b6cdf5c003f..305f42dcadf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_110.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_110.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_111.plan
index a3fd48f6205..f223dca24ca 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_111.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_111.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_112.plan
index b6cdf5c003f..e82440b088d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_112.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_112.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_113.plan
index 2f846fe5b3e..463e4e96450 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_113.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_113.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_114.plan
index a3fd48f6205..962cb937c2a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_114.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_114.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or Not Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_115.plan
index b6cdf5c003f..7e76e233789 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_115.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_115.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_116.plan
index af2e3795ac4..de4ce124a84 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_116.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_116.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_117.plan
index b6cdf5c003f..0b227fb3cef 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_117.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_117.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_118.plan
index bf6c1841167..0ab9fdb9c43 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_118.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_118.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_119.plan
index b6cdf5c003f..103bb896734 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_119.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_119.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_12.plan
index 2f846fe5b3e..a65d70b9230 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_120.plan
index be8825b9db4..cfcc0b53c37 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_120.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_120.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (n\\/a)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":6,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Stage\",\n                  \"PlanNodeId\":5\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_0_1\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_1\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Inputs\":\n                                      [\n                                        1,\n                                        2\n                                      ],\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (n\\/a)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_121.plan
index b6cdf5c003f..37c56af8b34 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_121.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_121.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0 Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_122.plan
index b6cdf5c003f..320d8b71151 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_122.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_122.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ... Or items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_123.plan
index b6cdf5c003f..e2b06601585 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_123.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_123.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_124.plan
index 35d7721fe8d..70c2e5fac2f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_124.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_124.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_125.plan
index b6cdf5c003f..1eec53797de 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_125.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_125.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_126.plan
index b44434b3733..f3f44b20a7d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_126.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_126.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_127.plan
index 35d7721fe8d..70c2e5fac2f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_127.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_127.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_128.plan
index b6cdf5c003f..98d6010e38b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_128.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_128.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_129.plan
index b6cdf5c003f..e9fefc4bd84 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_129.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_129.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_13.plan
index b6cdf5c003f..5d216059f81 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_130.plan
index af2e3795ac4..b5c72969cef 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_130.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_130.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_131.plan
index b6cdf5c003f..cc39b660453 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_131.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_131.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_132.plan
index c2b656ebbd5..574062e8f1e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_132.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_132.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And Exist(items1)\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_133.plan
index b6cdf5c003f..bb79eaade8e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_133.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_133.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_134.plan
index a3fd48f6205..75ea0de9c01 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_134.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_134.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_135.plan
index b6cdf5c003f..f6ce37233de 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_135.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_135.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0 Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_14.plan
index a3fd48f6205..2dd86527363 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_15.plan
index b6cdf5c003f..6bf373bdada 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_16.plan
index b6cdf5c003f..0bb69ad0cec 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_17.plan
index b6cdf5c003f..88767d1ae7d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_18.plan
index b6cdf5c003f..82bd35fe04b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_19.plan
index 0540b7e2642..c2e1cc7256a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_2.plan
index a3fd48f6205..a469c7ce77b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"Not Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_20.plan
index a3fd48f6205..c7c8c3c42fb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_21.plan
index af2e3795ac4..5ff4e1bae18 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_22.plan
index 0a45c953a13..40433255b0b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_23.plan
index b6cdf5c003f..3a6cfc5022c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_24.plan
index b6cdf5c003f..ea49713a12e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or Exist(items1)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_25.plan
index b6cdf5c003f..4f65c988ba3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_26.plan
index 2f846fe5b3e..cc1f347fa32 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items1) Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_27.plan
index b6cdf5c003f..bb696f3cfd8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_28.plan
index 97d93536dbb..45b5ff6254a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_28.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_28.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_29.plan
index 7676726f3f4..b268a433054 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_29.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_29.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_3.plan
index b44434b3733..113c5a477af 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_30.plan
index b6cdf5c003f..8d35ebb2b9b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_30.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_30.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(items1) And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_31.plan
index b44434b3733..2eb5996edf3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_31.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_31.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_32.plan
index b6cdf5c003f..0170ca4f2ca 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_32.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_32.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_33.plan
index 97d93536dbb..c58997d0b73 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_33.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_33.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_34.plan
index 7676726f3f4..2db34b59828 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_34.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_34.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_35.plan
index 7676726f3f4..ae561a3e458 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_35.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_35.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_36.plan
index b6cdf5c003f..f4c3f33f40e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_36.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_36.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0 Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_37.plan
index 97d93536dbb..f2203aa61a8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_37.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_37.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"Exist(items1) And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_38.plan
index 7676726f3f4..212e4f955a6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_38.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_38.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or Not\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_39.plan
index a3fd48f6205..520b8b84947 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_39.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_39.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_4.plan
index b6cdf5c003f..fe507c27e1a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_40.plan
index b6cdf5c003f..faf143f636e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_40.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_40.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_41.plan
index b6cdf5c003f..53d18046bbf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_41.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_41.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_42.plan
index b6cdf5c003f..89d6aa2c778 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_42.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_42.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_43.plan
index b6cdf5c003f..3dd21808c6f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_43.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_43.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_44.plan
index af2e3795ac4..1a700418d5c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_44.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_44.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_45.plan
index 97d93536dbb..0e8f3a896f4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_45.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_45.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_46.plan
index 9e4af62a2c8..6a5bc54a6a7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_46.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_46.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_47.plan
index b6cdf5c003f..fe507c27e1a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_47.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_47.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_48.plan
index b6cdf5c003f..db4f047c45e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_48.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_48.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_49.plan
index b6cdf5c003f..ebf16181380 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_49.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_49.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_5.plan
index b6cdf5c003f..76f48439b19 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_50.plan
index b6cdf5c003f..8b48183409f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_50.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_50.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_51.plan
index b6cdf5c003f..a1526115eb8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_51.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_51.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_52.plan
index a3fd48f6205..601abeb7618 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_52.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_52.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_53.plan
index b9b5e28fd1b..66142d886c1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_53.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_53.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_54.plan
index b6cdf5c003f..f9e04899bae 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_54.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_54.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_55.plan
index b6cdf5c003f..b91ad144c09 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_55.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_55.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_56.plan
index 2f846fe5b3e..85e00ebb5d7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_56.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_56.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Not Or Exist(items1)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_57.plan
index b6cdf5c003f..522cfec15be 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_57.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_57.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_58.plan
index b6cdf5c003f..ac1f4a28849 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_58.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_58.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_59.plan
index b6cdf5c003f..ed3df3e9f08 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_59.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_59.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_6.plan
index b6cdf5c003f..a9c0a41cfd9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_60.plan
index b6cdf5c003f..1ab0ed83556 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_60.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_60.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_61.plan
index a3fd48f6205..a9a27ef0838 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_61.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_61.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_62.plan
index af2e3795ac4..ef9fa8ec875 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_62.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_62.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_63.plan
index a3fd48f6205..65278f6f051 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_63.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_63.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_64.plan
index 43471ff8ca1..34a9b3cc99b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_64.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_64.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_65.plan
index b6cdf5c003f..b3071c9b4d8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_65.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_65.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_66.plan
index b6cdf5c003f..3292665dc7e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_66.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_66.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_67.plan
index a3fd48f6205..019c5ef7a65 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_67.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_67.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_68.plan
index a3fd48f6205..49715f3c670 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_68.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_68.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_69.plan
index 7676726f3f4..a9f4c0013af 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_69.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_69.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_7.plan
index b6cdf5c003f..d8907cd6f51 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_70.plan
index a3fd48f6205..8187e364ee2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_70.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_70.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"Exist(items1) And ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_71.plan
index a3fd48f6205..1cd405cdf7d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_71.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_71.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_72.plan
index b6cdf5c003f..e7dfa3c06ae 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_72.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_72.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_73.plan
index af2e3795ac4..79f7b9f1f68 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_73.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_73.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_74.plan
index a3fd48f6205..fae29ca7c7d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_74.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_74.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_75.plan
index b6cdf5c003f..12389f95735 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_75.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_75.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_76.plan
index b6cdf5c003f..c6c5bdb8462 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_76.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_76.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_77.plan
index 7676726f3f4..2b35a31fb66 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_77.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_77.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_78.plan
index b6cdf5c003f..030a98f0dd8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_78.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_78.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_79.plan
index af2e3795ac4..5ae26dfc410 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_79.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_79.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_8.plan
index a3fd48f6205..32859182701 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col7 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_80.plan
index b6cdf5c003f..1d8bc1bd232 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_80.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_80.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_81.plan
index b6cdf5c003f..03abed3a296 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_81.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_81.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_82.plan
index a3fd48f6205..601abeb7618 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_82.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_82.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_83.plan
index 7676726f3f4..e4f43c6682b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_83.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_83.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_84.plan
index a3fd48f6205..96b4872b79b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_84.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_84.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_85.plan
index b6cdf5c003f..aa7057ed2ec 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_85.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_85.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_86.plan
index a3fd48f6205..bb98df10c53 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_86.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_86.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_87.plan
index 7d89df55911..7bf34f04954 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_87.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_87.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (0)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (0)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_88.plan
index b6cdf5c003f..8fa88f716af 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_88.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_88.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_89.plan
index 0540b7e2642..29ccd7a7a0d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_89.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_89.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"Exist(items1)\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_9.plan
index b6cdf5c003f..c6bdbbf6406 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_90.plan
index b6cdf5c003f..53395b99f74 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_90.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_90.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_91.plan
index 97d93536dbb..865a40bb210 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_91.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_91.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_92.plan
index b6cdf5c003f..24105368f70 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_92.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_92.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_93.plan
index b6cdf5c003f..0b7951dc498 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_93.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_93.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_94.plan
index b6cdf5c003f..e2b06601585 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_94.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_94.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_95.plan
index b6cdf5c003f..c262a92cc55 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_95.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_95.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_96.plan
index be8825b9db4..1c11ff4d7a7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_96.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_96.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"Lookup\",\n              \"lookup_by\":\n                [\n                  \"a (expr)\"\n                ],\n              \"scan_by\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"a (n\\/a)\"\n            ],\n          \"scan_by\":\n            [\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":6,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Stage\",\n                  \"PlanNodeId\":5\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"Precompute_0_1\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_1\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate-Filter-TablePointLookup\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Inputs\":\n                                      [\n                                        1,\n                                        2\n                                      ],\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TablePointLookup\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (n\\/a)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_97.plan
index b6cdf5c003f..85666d9f6cc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_97.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_97.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_98.plan
index a3fd48f6205..94a5333db6f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_98.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_98.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select2-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_99.plan
index b6cdf5c003f..4bba9e7db6b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_99.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_99.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And Exist(items1)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_1.plan
index 9215c170afe..9b87d618b94 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0 Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_2.plan
index 9215c170afe..c9ce895483b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or items0 != 0\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_3.plan
index 9215c170afe..ca3efa3fc14 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_4.plan
index 9215c170afe..20691b89292 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items0 != 0 And Exist(items1)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_5.plan
index 9215c170afe..b0c0bb6c5ef 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And Exist(items1)\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_6.plan
index 9215c170afe..4fd1a1516cd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or items0 != 0 Or Not\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_7.plan
index af5a209925b..3dbbc795752 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_8.plan
index 9215c170afe..c5d06911427 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_9.plan
index 9215c170afe..757b4bb1a51 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select2-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select2-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or Not\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select2-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select2-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_1.plan
index 84cc18ed379..19c7d5a336f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_10.plan
index 0bf5fd034c2..cdd31f1643b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_100.plan
index 0bf5fd034c2..9342c78ffad 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_100.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_100.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_101.plan
index 0bf5fd034c2..e175511d1e6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_101.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_101.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_102.plan
index 0bf5fd034c2..fc4dc0f4dc1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_102.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_102.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_103.plan
index 0bf5fd034c2..17b0aa3d23a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_103.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_103.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_104.plan
index 0bf5fd034c2..17b0aa3d23a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_104.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_104.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_105.plan
index ebb9d952451..22ea244fe25 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_105.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_105.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_106.plan
index ebb9d952451..23f6196e76e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_106.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_106.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_107.plan
index 0bf5fd034c2..8e22ebbc83e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_107.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_107.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_108.plan
index 0bf5fd034c2..60d0bb1be33 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_108.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_108.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_109.plan
index 34ed66d704e..e93662388ae 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_109.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_109.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_11.plan
index 0bf5fd034c2..7af58a8dada 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_110.plan
index 34ed66d704e..e93662388ae 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_110.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_110.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_111.plan
index 34ed66d704e..472468d07ed 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_111.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_111.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_112.plan
index 34ed66d704e..472468d07ed 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_112.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_112.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_113.plan
index 34ed66d704e..9e9691fe97c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_113.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_113.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_114.plan
index 34ed66d704e..9e9691fe97c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_114.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_114.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_115.plan
index 34ed66d704e..472468d07ed 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_115.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_115.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_116.plan
index 34ed66d704e..472468d07ed 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_116.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_116.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_117.plan
index ebb9d952451..a07d06b84d1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_117.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_117.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_118.plan
index ebb9d952451..a07d06b84d1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_118.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_118.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_119.plan
index 34ed66d704e..6b95de3f0c1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_119.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_119.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_12.plan
index 0bf5fd034c2..1b87f15d066 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_120.plan
index 34ed66d704e..94866c0c478 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_120.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_120.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_121.plan
index 34ed66d704e..6b95de3f0c1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_121.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_121.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_122.plan
index 34ed66d704e..701c5bd9e13 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_122.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_122.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_123.plan
index 34ed66d704e..6b95de3f0c1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_123.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_123.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_124.plan
index 34ed66d704e..438e0f78f25 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_124.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_124.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_125.plan
index 0bf5fd034c2..bef3c1fa843 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_125.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_125.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_126.plan
index 0bf5fd034c2..2347c4af216 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_126.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_126.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_127.plan
index 0bf5fd034c2..5365f757d7b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_127.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_127.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_128.plan
index 0bf5fd034c2..9d76f2334d0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_128.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_128.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_129.plan
index 0bf5fd034c2..8e22ebbc83e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_129.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_129.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_13.plan
index 0bf5fd034c2..7af58a8dada 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_130.plan
index 0bf5fd034c2..2fa0e7503cf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_130.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_130.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col7 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_131.plan
index ed3694c4fbb..49d0760a4fb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_131.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_131.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_132.plan
index ed3694c4fbb..49d0760a4fb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_132.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_132.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_133.plan
index 0bf5fd034c2..867e01b999e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_133.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_133.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_134.plan
index 0bf5fd034c2..815e2628f6d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_134.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_134.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_135.plan
index 34ed66d704e..c0a1b36bffb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_135.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_135.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_136.plan
index 34ed66d704e..2a8f85f1dd1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_136.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_136.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_137.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_137.plan
index 0bf5fd034c2..bca8a22df50 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_137.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_137.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_138.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_138.plan
index 0bf5fd034c2..904f65453f0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_138.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_138.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_139.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_139.plan
index 0bf5fd034c2..bca8a22df50 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_139.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_139.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_14.plan
index 0bf5fd034c2..02eb24d096b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_140.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_140.plan
index 0bf5fd034c2..f118eff0ad4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_140.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_140.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_141.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_141.plan
index 0bf5fd034c2..bca8a22df50 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_141.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_141.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_142.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_142.plan
index 0bf5fd034c2..403bbf5e784 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_142.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_142.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_143.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_143.plan
index 0bf5fd034c2..bca8a22df50 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_143.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_143.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_144.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_144.plan
index 0bf5fd034c2..f118eff0ad4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_144.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_144.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_145.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_145.plan
index 0bf5fd034c2..7cd0acf73e3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_145.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_145.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_146.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_146.plan
index 0bf5fd034c2..7cd0acf73e3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_146.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_146.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_147.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_147.plan
index 0bf5fd034c2..994e6629d18 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_147.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_147.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_15.plan
index 0bf5fd034c2..7af58a8dada 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_16.plan
index 0bf5fd034c2..7af58a8dada 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_17.plan
index ed3694c4fbb..4a9fefa0993 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_18.plan
index ed3694c4fbb..575d6dd25ed 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_19.plan
index ed3694c4fbb..4a9fefa0993 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_2.plan
index 84cc18ed379..19c7d5a336f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_20.plan
index ed3694c4fbb..e30672b8e1d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_21.plan
index 0bf5fd034c2..7cd0acf73e3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_22.plan
index 0bf5fd034c2..7cd0acf73e3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_23.plan
index 0bf5fd034c2..fa6c1c8f350 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_24.plan
index 0bf5fd034c2..fa6c1c8f350 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_25.plan
index 4e185f043d3..673c4d99ef8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_26.plan
index 4e185f043d3..673c4d99ef8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_27.plan
index 4e185f043d3..673c4d99ef8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_28.plan
index 4e185f043d3..673c4d99ef8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_28.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_28.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_29.plan
index 0bf5fd034c2..1e280da44e1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_29.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_29.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_3.plan
index 0bf5fd034c2..c03eee99ef0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_30.plan
index 0bf5fd034c2..1e280da44e1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_30.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_30.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_31.plan
index 0bf5fd034c2..1e280da44e1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_31.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_31.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_32.plan
index 0bf5fd034c2..852edf28dab 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_32.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_32.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_33.plan
index 0bf5fd034c2..1e280da44e1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_33.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_33.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_34.plan
index 0bf5fd034c2..852edf28dab 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_34.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_34.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_35.plan
index 0bf5fd034c2..1e280da44e1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_35.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_35.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_36.plan
index 0bf5fd034c2..1e280da44e1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_36.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_36.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_37.plan
index 0bf5fd034c2..1e280da44e1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_37.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_37.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_38.plan
index 0bf5fd034c2..98d7007e317 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_38.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_38.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_39.plan
index ed3694c4fbb..2ffecd1c2d0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_39.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_39.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_4.plan
index 0bf5fd034c2..eaa2a61382f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_40.plan
index ed3694c4fbb..f40131ed6cf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_40.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_40.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_41.plan
index 0bf5fd034c2..e0abd77492c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_41.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_41.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_42.plan
index 0bf5fd034c2..e0abd77492c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_42.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_42.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_43.plan
index 0bf5fd034c2..5463a87eef8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_43.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_43.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_44.plan
index 0bf5fd034c2..5463a87eef8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_44.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_44.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_45.plan
index 0bf5fd034c2..f2ff21f3472 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_45.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_45.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_46.plan
index 0bf5fd034c2..658429e5369 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_46.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_46.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_47.plan
index 0bf5fd034c2..10408d59b5b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_47.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_47.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_48.plan
index 0bf5fd034c2..da973482f01 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_48.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_48.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_49.plan
index 0bf5fd034c2..10408d59b5b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_49.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_49.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_5.plan
index 0bf5fd034c2..1d6ed48c505 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_50.plan
index 0bf5fd034c2..7495d345fd6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_50.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_50.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_51.plan
index 0bf5fd034c2..f8a3d0df0b1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_51.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_51.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_52.plan
index 0bf5fd034c2..556ed71e35c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_52.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_52.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_53.plan
index 0bf5fd034c2..12de98d5dd0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_53.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_53.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_54.plan
index 0bf5fd034c2..12de98d5dd0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_54.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_54.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_55.plan
index 0bf5fd034c2..12de98d5dd0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_55.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_55.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_56.plan
index 0bf5fd034c2..e975ca29320 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_56.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_56.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_57.plan
index 0bf5fd034c2..12de98d5dd0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_57.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_57.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_58.plan
index 0bf5fd034c2..12de98d5dd0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_58.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_58.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_59.plan
index 0bf5fd034c2..26591a8fe91 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_59.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_59.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_6.plan
index 0bf5fd034c2..7b67ba6b8cb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_60.plan
index 0bf5fd034c2..6afd671ac7f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_60.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_60.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_61.plan
index 0bf5fd034c2..240a5a7ba6c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_61.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_61.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_62.plan
index 0bf5fd034c2..8587694f826 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_62.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_62.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_63.plan
index 0bf5fd034c2..43d5faa5b92 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_63.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_63.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_64.plan
index 0bf5fd034c2..7e6122335de 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_64.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_64.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_65.plan
index 0bf5fd034c2..26591a8fe91 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_65.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_65.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_66.plan
index 0bf5fd034c2..7139bf796ef 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_66.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_66.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_67.plan
index 34ed66d704e..3be8562d1a0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_67.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_67.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_68.plan
index 34ed66d704e..13b05f106a4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_68.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_68.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_69.plan
index 34ed66d704e..025cad6b25e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_69.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_69.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_7.plan
index 0bf5fd034c2..1e280da44e1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_70.plan
index 34ed66d704e..46a3e3e542f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_70.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_70.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_71.plan
index 34ed66d704e..f4812db480f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_71.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_71.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_72.plan
index 34ed66d704e..d92dec4c510 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_72.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_72.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_73.plan
index 34ed66d704e..8a84067558f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_73.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_73.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_74.plan
index 34ed66d704e..ab6321b510a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_74.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_74.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_75.plan
index 0bf5fd034c2..74fb7ee1050 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_75.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_75.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_76.plan
index 0bf5fd034c2..2c3bc8751aa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_76.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_76.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_77.plan
index 98767f3b0d7..29b9a9446a3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_77.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_77.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_78.plan
index 98767f3b0d7..29b9a9446a3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_78.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_78.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_79.plan
index 34ed66d704e..97dde6f84fd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_79.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_79.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_8.plan
index 0bf5fd034c2..98d7007e317 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_80.plan
index 34ed66d704e..f6383c9d704 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_80.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_80.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_81.plan
index 34ed66d704e..97dde6f84fd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_81.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_81.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_82.plan
index 34ed66d704e..97dde6f84fd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_82.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_82.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_83.plan
index 7f51c395487..f0ddd439815 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_83.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_83.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_84.plan
index 7f51c395487..fe9ce2ad0fa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_84.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_84.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-1.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_85.plan
index 0bf5fd034c2..1d6ed48c505 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_85.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_85.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_86.plan
index 0bf5fd034c2..06764c4369a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_86.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_86.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_87.plan
index 0bf5fd034c2..e474ff0a26e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_87.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_87.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_88.plan
index 0bf5fd034c2..e474ff0a26e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_88.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_88.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_89.plan
index 0bf5fd034c2..94f7defc198 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_89.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_89.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_9.plan
index 0bf5fd034c2..7af58a8dada 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_90.plan
index 0bf5fd034c2..94f7defc198 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_90.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_90.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_91.plan
index 0bf5fd034c2..865cc98ad4a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_91.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_91.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_92.plan
index 0bf5fd034c2..a185681a800 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_92.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_92.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_93.plan
index 0bf5fd034c2..6b6ca8145da 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_93.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_93.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_94.plan
index 0bf5fd034c2..9341b67bbaa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_94.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_94.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_95.plan
index 0bf5fd034c2..54c724d813c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_95.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_95.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_96.plan
index 0bf5fd034c2..62f02316a62 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_96.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_96.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_97.plan
index 0bf5fd034c2..47b6d51f22d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_97.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_97.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_98.plan
index 0bf5fd034c2..6abd823cb56 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_98.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_98.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_99.plan
index 0bf5fd034c2..b551aaa9f52 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_99.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_99.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-1.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-1.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-1.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_1.plan
index 07364027ebc..3a700d9729c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_10.plan
index 07364027ebc..d62282ab7b4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_100.plan
index 07364027ebc..d502986afcb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_100.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_100.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_101.plan
index 07364027ebc..7c9c0699d8b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_101.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_101.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_102.plan
index 07364027ebc..9cbcde8a85e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_102.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_102.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_103.plan
index 07364027ebc..4ed552d2962 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_103.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_103.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_104.plan
index 07364027ebc..b111a2f8cb2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_104.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_104.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_105.plan
index 07364027ebc..4ed552d2962 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_105.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_105.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_106.plan
index 07364027ebc..bdc32d20e39 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_106.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_106.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_107.plan
index 07364027ebc..9372aeca575 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_107.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_107.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_108.plan
index 07364027ebc..828411ff3a9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_108.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_108.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_109.plan
index 07364027ebc..a7357c55301 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_109.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_109.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_11.plan
index 70bc347bab1..24c25a3cdfe 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-10.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_110.plan
index 07364027ebc..e87c8ce307b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_110.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_110.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_111.plan
index a2c3aed93c6..a7bc37c50fa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_111.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_111.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_112.plan
index a2c3aed93c6..a7bc37c50fa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_112.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_112.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_113.plan
index a2c3aed93c6..a7bc37c50fa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_113.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_113.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_114.plan
index a2c3aed93c6..a7bc37c50fa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_114.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_114.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_115.plan
index 07364027ebc..28edb7508df 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_115.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_115.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_116.plan
index 07364027ebc..f4ca00c62c5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_116.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_116.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_117.plan
index 07364027ebc..32fb2c21273 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_117.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_117.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_118.plan
index 07364027ebc..32fb2c21273 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_118.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_118.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_119.plan
index 07364027ebc..700e77f19fa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_119.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_119.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_12.plan
index 70bc347bab1..7412fb604c7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-10.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_120.plan
index 07364027ebc..700e77f19fa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_120.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_120.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_121.plan
index 07364027ebc..700e77f19fa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_121.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_121.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_122.plan
index 07364027ebc..700e77f19fa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_122.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_122.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_123.plan
index 07364027ebc..4e1df3dcaa5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_123.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_123.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_124.plan
index 07364027ebc..67ca74250e6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_124.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_124.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_125.plan
index 07364027ebc..3b07b461e5c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_125.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_125.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_126.plan
index 07364027ebc..ab85857c96c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_126.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_126.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_127.plan
index 07364027ebc..0d81bcfe759 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_127.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_127.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_128.plan
index 07364027ebc..0d81bcfe759 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_128.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_128.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_129.plan
index 07364027ebc..0d81bcfe759 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_129.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_129.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_13.plan
index f54373c82dd..79b0ca189e1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_130.plan
index 07364027ebc..a04c1527a05 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_130.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_130.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_131.plan
index 07364027ebc..0d81bcfe759 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_131.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_131.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_132.plan
index 07364027ebc..a04c1527a05 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_132.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_132.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_14.plan
index f54373c82dd..cf016ee06fd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_15.plan
index 07364027ebc..46c634eb3dc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_16.plan
index 07364027ebc..46c634eb3dc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_17.plan
index 07364027ebc..478903dec38 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_18.plan
index 07364027ebc..478903dec38 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_19.plan
index 07364027ebc..46c634eb3dc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_2.plan
index 07364027ebc..b4b5aa408a3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_20.plan
index 07364027ebc..46c634eb3dc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_21.plan
index 07364027ebc..b0502a7d0d1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_22.plan
index 07364027ebc..85ffb1b4324 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_23.plan
index 70bc347bab1..60e91964c35 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-10.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_24.plan
index 70bc347bab1..4a30d1a001a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-10.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_25.plan
index 07364027ebc..7d8700b6476 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_26.plan
index 07364027ebc..f713d29f4bc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_27.plan
index 07364027ebc..0f32babeeb7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_28.plan
index 07364027ebc..0f32babeeb7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_28.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_28.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_29.plan
index 07364027ebc..604663a8f3c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_29.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_29.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_3.plan
index 07364027ebc..a638fa43f0c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_30.plan
index 07364027ebc..8c84937f0f8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_30.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_30.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_31.plan
index 07364027ebc..af12476476c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_31.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_31.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_32.plan
index 07364027ebc..b659629ea66 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_32.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_32.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_33.plan
index 458d2a2c960..076c46cf90f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_33.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_33.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_34.plan
index 458d2a2c960..076c46cf90f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_34.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_34.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_35.plan
index 458d2a2c960..076c46cf90f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_35.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_35.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_36.plan
index 458d2a2c960..076c46cf90f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_36.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_36.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_37.plan
index f54373c82dd..7ea2964a971 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_37.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_37.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 \\u003C 110 Or items2 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_38.plan
index f54373c82dd..c376aa28567 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_38.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_38.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 \\u003C 110 Or items2 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_39.plan
index 07364027ebc..b0502a7d0d1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_39.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_39.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_4.plan
index 07364027ebc..0e94063fc05 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_40.plan
index 07364027ebc..20ce03cf57f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_40.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_40.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_41.plan
index 07364027ebc..e5ef0fea298 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_41.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_41.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_42.plan
index 07364027ebc..6867c1f9a6a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_42.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_42.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_43.plan
index 07364027ebc..8410e8a8a0d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_43.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_43.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_44.plan
index 07364027ebc..9ba0c61fdc2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_44.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_44.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_45.plan
index 2befafd7b34..60748375d38 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_45.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_45.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_46.plan
index 2befafd7b34..60748375d38 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_46.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_46.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_47.plan
index 09ff95f11ca..b70ddc8d674 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_47.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_47.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_48.plan
index 09ff95f11ca..b70ddc8d674 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_48.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_48.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_49.plan
index c34ccb4166e..0a661a03c60 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_49.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_49.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_5.plan
index 07364027ebc..bb7a6392b14 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_50.plan
index c34ccb4166e..0a661a03c60 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_50.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_50.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_51.plan
index 03216aec457..4622f87a21f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_51.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_51.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items2 \\u003C 110 Or items2 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_52.plan
index 03216aec457..4622f87a21f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_52.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_52.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items2 \\u003C 110 Or items2 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_53.plan
index 03216aec457..a0ee4e38546 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_53.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_53.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 \\u003C 110 Or items2 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_54.plan
index 03216aec457..a0ee4e38546 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_54.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_54.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 \\u003C 110 Or items2 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_55.plan
index 988bcac863f..afdb1e8b556 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_55.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_55.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_56.plan
index 988bcac863f..49ea7b5dd3b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_56.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_56.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_57.plan
index 988bcac863f..d61bd7397ee 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_57.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_57.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_58.plan
index 988bcac863f..7358c6d76d5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_58.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_58.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_59.plan
index 988bcac863f..d61bd7397ee 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_59.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_59.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_6.plan
index 07364027ebc..282072fc87c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_60.plan
index 988bcac863f..7358c6d76d5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_60.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_60.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_61.plan
index 0969f7f657e..977cceff86e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_61.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_61.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_62.plan
index 0969f7f657e..c664cfca1ee 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_62.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_62.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_63.plan
index c34ccb4166e..0a661a03c60 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_63.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_63.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_64.plan
index c34ccb4166e..0a661a03c60 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_64.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_64.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_65.plan
index 07364027ebc..a6baccb66da 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_65.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_65.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_66.plan
index 07364027ebc..4f5f04118a1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_66.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_66.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_67.plan
index 07364027ebc..ed2815d9c5b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_67.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_67.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_68.plan
index 07364027ebc..ceb69d24fc1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_68.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_68.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_69.plan
index 70bc347bab1..fe6bf15365e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_69.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_69.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-10.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_7.plan
index 07364027ebc..4b282313006 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_70.plan
index 70bc347bab1..69d8623b480 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_70.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_70.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-10.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_71.plan
index 07364027ebc..54e645d9742 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_71.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_71.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_72.plan
index 07364027ebc..f992a3b8673 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_72.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_72.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_73.plan
index 07364027ebc..e5986b329eb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_73.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_73.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_74.plan
index 07364027ebc..0f156c1857b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_74.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_74.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_75.plan
index 70bc347bab1..ad01b461ad0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_75.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_75.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-10.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_76.plan
index 70bc347bab1..d6c6f1c7c9f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_76.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_76.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-10.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_77.plan
index 07364027ebc..28edb7508df 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_77.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_77.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_78.plan
index 07364027ebc..78b44a82d26 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_78.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_78.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_79.plan
index 07364027ebc..e866e1270c7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_79.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_79.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_8.plan
index 07364027ebc..f61b5b07d42 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_80.plan
index 07364027ebc..e866e1270c7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_80.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_80.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_81.plan
index 07364027ebc..e866e1270c7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_81.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_81.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_82.plan
index 07364027ebc..f92a695235d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_82.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_82.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_83.plan
index 07364027ebc..86823c727a5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_83.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_83.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_84.plan
index 07364027ebc..333ef86af21 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_84.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_84.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_85.plan
index 703795fd09e..9879ff2a773 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_85.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_85.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And items1 \\u003C 110 Or items1 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_86.plan
index 703795fd09e..9879ff2a773 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_86.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_86.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And items1 \\u003C 110 Or items1 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_87.plan
index 703795fd09e..a30eab2ecee 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_87.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_87.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items1 \\u003C 110 Or items1 \\u003E 150 And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_88.plan
index 703795fd09e..a30eab2ecee 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_88.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_88.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items1 \\u003C 110 Or items1 \\u003E 150 And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_89.plan
index 703795fd09e..59ca7af1050 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_89.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_89.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items1 \\u003C 110 Or items1 \\u003E 150 And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_9.plan
index 07364027ebc..4b282313006 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_90.plan
index 703795fd09e..59ca7af1050 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_90.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_90.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items1 \\u003C 110 Or items1 \\u003E 150 And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_91.plan
index 703795fd09e..0a664405c24 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_91.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_91.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And items1 \\u003C 110 Or items1 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_92.plan
index 703795fd09e..0a664405c24 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_92.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_92.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And items1 \\u003C 110 Or items1 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_93.plan
index 70bc347bab1..04a950aefae 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_93.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_93.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-10.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_94.plan
index 70bc347bab1..2de62501e51 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_94.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_94.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-10.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_95.plan
index 07364027ebc..3b07b461e5c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_95.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_95.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_96.plan
index 07364027ebc..8fafa40c5ec 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_96.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_96.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_97.plan
index 70bc347bab1..0621c507620 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_97.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_97.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-10.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_98.plan
index 70bc347bab1..8287f79aa0a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_98.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_98.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-10.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_99.plan
index 07364027ebc..a58d7786540 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_99.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_99.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-10.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-10.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-10.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_1.plan
index 3cf39242874..751818f5745 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_10.plan
index 3cf39242874..13af4979f28 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_100.plan
index 3cf39242874..bc7b1641b1e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_100.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_100.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_101.plan
index db3338c6c89..b61961fe8e1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_101.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_101.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_102.plan
index db3338c6c89..b61961fe8e1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_102.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_102.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_103.plan
index 3cf39242874..2bcfa4ab951 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_103.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_103.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_104.plan
index 3cf39242874..2bcfa4ab951 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_104.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_104.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_105.plan
index df7a48f6e57..10fa333d578 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_105.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_105.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-11.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_106.plan
index df7a48f6e57..10fa333d578 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_106.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_106.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-11.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_11.plan
index 3cf39242874..3406b97c9bb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_12.plan
index 3cf39242874..11e7155bb91 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_13.plan
index c546749fabb..1a208e82a94 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_14.plan
index c546749fabb..1a208e82a94 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_15.plan
index c2c1d59fb3b..6dbcac3d555 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_16.plan
index c2c1d59fb3b..9ac65d52d49 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_17.plan
index 3cf39242874..23ecbdad719 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_18.plan
index 3cf39242874..a92c03d10b6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_19.plan
index df7a48f6e57..e4f15d9a180 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-11.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_2.plan
index 3cf39242874..2359eaadf9a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_20.plan
index df7a48f6e57..e4f15d9a180 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-11.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_21.plan
index 3cf39242874..0accee7706d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_22.plan
index 3cf39242874..0accee7706d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_23.plan
index 3cf39242874..bf64ca122dd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_24.plan
index 3cf39242874..bf64ca122dd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_25.plan
index 3cf39242874..28db789ced8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_26.plan
index 3cf39242874..28db789ced8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_27.plan
index cbb06d990a1..efa9b928354 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_28.plan
index cbb06d990a1..efa9b928354 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_28.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_28.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_29.plan
index c546749fabb..fe3ebe90ee1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_29.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_29.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_3.plan
index 3cf39242874..a1a9728be96 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_30.plan
index c546749fabb..fe3ebe90ee1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_30.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_30.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_31.plan
index df7a48f6e57..b2a577f432a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_31.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_31.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-11.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_32.plan
index df7a48f6e57..b2a577f432a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_32.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_32.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-11.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_33.plan
index 3cf39242874..2b625dd596b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_33.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_33.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_34.plan
index 3cf39242874..2cb564f79f2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_34.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_34.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_35.plan
index 3cf39242874..2b625dd596b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_35.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_35.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_36.plan
index 3cf39242874..5b9ae766cde 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_36.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_36.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_37.plan
index 3cf39242874..2b625dd596b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_37.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_37.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_38.plan
index 3cf39242874..365042a10a9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_38.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_38.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_39.plan
index 3cf39242874..c782bf7d205 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_39.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_39.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_4.plan
index 3cf39242874..26df594b38b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_40.plan
index 3cf39242874..c782bf7d205 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_40.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_40.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_41.plan
index cbb06d990a1..6c53a771795 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_41.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_41.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_42.plan
index cbb06d990a1..6c53a771795 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_42.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_42.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_43.plan
index 2a0f7954604..a279ece244b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_43.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_43.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-11.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_44.plan
index 2a0f7954604..8fde91a511d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_44.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_44.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-11.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_45.plan
index 2a0f7954604..4c9d36401c3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_45.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_45.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-11.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_46.plan
index 2a0f7954604..4c9d36401c3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_46.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_46.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-11.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_47.plan
index 2a0f7954604..a13f8f6747d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_47.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_47.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-11.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_48.plan
index 2a0f7954604..6b71623ae09 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_48.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_48.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-11.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_49.plan
index 3cf39242874..fb7c1dd385c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_49.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_49.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_5.plan
index 2a0f7954604..95ab1280d95 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-11.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_50.plan
index 3cf39242874..2acaebca6a1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_50.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_50.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col7 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_51.plan
index 3cf39242874..0a9c6412737 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_51.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_51.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_52.plan
index 3cf39242874..d436e3a0bb2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_52.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_52.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_53.plan
index 3cf39242874..1b7e926f798 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_53.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_53.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_54.plan
index 3cf39242874..0d683ba681a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_54.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_54.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_55.plan
index 3cf39242874..e9db88617e4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_55.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_55.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_56.plan
index 3cf39242874..0353a4055a5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_56.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_56.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_57.plan
index a4b2b79a12e..84e66019d95 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_57.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_57.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_58.plan
index a4b2b79a12e..0235ee3c69c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_58.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_58.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_59.plan
index cbb06d990a1..6c53a771795 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_59.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_59.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_6.plan
index 2a0f7954604..c29ca2aac1c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-11.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_60.plan
index cbb06d990a1..6c53a771795 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_60.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_60.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_61.plan
index 7ee1912a946..eb7764cd540 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_61.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_61.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_62.plan
index 7ee1912a946..7e28d8eb2e1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_62.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_62.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_63.plan
index 3cf39242874..dea8600fcce 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_63.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_63.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_64.plan
index 3cf39242874..f4fe07656f8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_64.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_64.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_65.plan
index 3cf39242874..319aa6fd084 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_65.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_65.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_66.plan
index 3cf39242874..815ee205e18 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_66.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_66.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_67.plan
index 3cf39242874..25b9f54a074 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_67.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_67.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_68.plan
index 3cf39242874..97d47250667 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_68.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_68.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_69.plan
index 3cf39242874..a7091f22f47 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_69.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_69.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_7.plan
index 3cf39242874..ef3edd470cf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_70.plan
index 3cf39242874..97197369863 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_70.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_70.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_71.plan
index b6aced75a25..e0975237fdc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_71.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_71.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_72.plan
index b6aced75a25..e0975237fdc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_72.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_72.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_73.plan
index 3cf39242874..c782bf7d205 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_73.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_73.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_74.plan
index 3cf39242874..78e1e48f9dd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_74.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_74.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_75.plan
index 3cf39242874..c782bf7d205 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_75.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_75.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_76.plan
index 3cf39242874..78e1e48f9dd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_76.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_76.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_77.plan
index 3cf39242874..3f7b5285250 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_77.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_77.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_78.plan
index 3cf39242874..ea9dda0f42f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_78.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_78.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_79.plan
index 3cf39242874..a7091f22f47 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_79.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_79.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_8.plan
index 3cf39242874..7048a7e904a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_80.plan
index 3cf39242874..34ba7db4a0d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_80.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_80.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_81.plan
index 3cf39242874..13e1ccb8b69 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_81.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_81.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_82.plan
index 3cf39242874..78fa4d3bc35 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_82.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_82.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_83.plan
index 3cf39242874..2aa808275e3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_83.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_83.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_84.plan
index 3cf39242874..58f4f1a9739 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_84.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_84.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_85.plan
index 3cf39242874..2aa808275e3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_85.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_85.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_86.plan
index 3cf39242874..1637592bfd7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_86.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_86.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_87.plan
index 3cf39242874..fdb9f8fe1bd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_87.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_87.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_88.plan
index 3cf39242874..f28b5b62fb1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_88.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_88.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_89.plan
index c5c79f39cb0..87ed4025300 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_89.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_89.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 \\u003C 110 Or items2 \\u003E 150 And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_9.plan
index 3cf39242874..3406b97c9bb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_90.plan
index c5c79f39cb0..5fac4897e1b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_90.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_90.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 \\u003C 110 Or items2 \\u003E 150 And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_91.plan
index 3cf39242874..319aa6fd084 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_91.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_91.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_92.plan
index 3cf39242874..cfd1a7b45ff 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_92.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_92.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_93.plan
index 3cf39242874..f67058f2247 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_93.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_93.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_94.plan
index 3cf39242874..bc7b1641b1e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_94.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_94.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_95.plan
index 3cf39242874..f67058f2247 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_95.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_95.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_96.plan
index 3cf39242874..eb7e9fc4c01 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_96.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_96.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_97.plan
index 3cf39242874..f67058f2247 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_97.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_97.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_98.plan
index 3cf39242874..eb7e9fc4c01 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_98.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_98.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_99.plan
index 3cf39242874..f67058f2247 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_99.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_99.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-11.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-11.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-11.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_1.plan
index f368bce5273..f18cb0d611d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_10.plan
index a1597e70674..3613cd84147 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_100.plan
index a1597e70674..5897d7f7a2b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_100.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_100.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_101.plan
index a1597e70674..5897d7f7a2b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_101.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_101.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_102.plan
index a1597e70674..5121df4bf40 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_102.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_102.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_103.plan
index 001024471a8..24455636d9c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_103.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_103.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_104.plan
index 001024471a8..96ba0247808 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_104.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_104.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_105.plan
index 36dacb34082..8433b3a969e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_105.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_105.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_106.plan
index 36dacb34082..d30e559e1b8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_106.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_106.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_107.plan
index 36dacb34082..0dc7e3e69cd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_107.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_107.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_108.plan
index 36dacb34082..97146f66951 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_108.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_108.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_109.plan
index 36dacb34082..1ca57439cb0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_109.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_109.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_11.plan
index a1597e70674..7feccd00029 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_110.plan
index 36dacb34082..ab9efe29a07 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_110.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_110.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_111.plan
index 36dacb34082..41c30a05dda 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_111.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_111.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_112.plan
index 36dacb34082..2a761c103f9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_112.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_112.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_113.plan
index a1597e70674..80b1ef92c4b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_113.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_113.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_114.plan
index a1597e70674..4bbbddf9094 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_114.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_114.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_115.plan
index a1597e70674..f89199d44ad 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_115.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_115.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_116.plan
index a1597e70674..f89199d44ad 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_116.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_116.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_117.plan
index a1597e70674..b915fdfd731 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_117.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_117.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150 And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_118.plan
index a1597e70674..b915fdfd731 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_118.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_118.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150 And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_119.plan
index a1597e70674..099be912b0d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_119.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_119.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_12.plan
index a1597e70674..a0a95936bff 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_120.plan
index a1597e70674..099be912b0d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_120.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_120.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_121.plan
index f4c7d6ee1ba..7948355bf9b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_121.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_121.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_122.plan
index f4c7d6ee1ba..46608780fc0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_122.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_122.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_123.plan
index a1597e70674..ea6a27d1ea3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_123.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_123.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_124.plan
index a1597e70674..62dd9357216 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_124.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_124.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_125.plan
index cabc5252294..85b272725fd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_125.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_125.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items1 \\u003C 110 Or items1 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_126.plan
index cabc5252294..d6cf464f015 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_126.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_126.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items1 \\u003C 110 Or items1 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_127.plan
index 114122fe5e4..67041b14308 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_127.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_127.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_128.plan
index 114122fe5e4..67041b14308 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_128.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_128.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_129.plan
index 114122fe5e4..1442572cd14 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_129.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_129.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_13.plan
index cabc5252294..2e437f58eff 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_130.plan
index 114122fe5e4..1442572cd14 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_130.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_130.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_131.plan
index a1597e70674..1618c553018 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_131.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_131.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_132.plan
index a1597e70674..054e83c897e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_132.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_132.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_133.plan
index a1597e70674..e0926360f94 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_133.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_133.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_134.plan
index a1597e70674..fc9ce5ffe25 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_134.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_134.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_135.plan
index a1597e70674..a4684461142 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_135.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_135.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_136.plan
index a1597e70674..e2828156234 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_136.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_136.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_137.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_137.plan
index a1597e70674..1618c553018 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_137.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_137.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_138.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_138.plan
index a1597e70674..a4aeeb7174e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_138.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_138.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_139.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_139.plan
index 36dacb34082..0da16c8c598 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_139.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_139.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_14.plan
index cabc5252294..2e437f58eff 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_140.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_140.plan
index 36dacb34082..9667d84a9df 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_140.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_140.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_141.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_141.plan
index a1597e70674..086692a9474 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_141.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_141.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_142.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_142.plan
index a1597e70674..36e94c6ecd1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_142.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_142.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_143.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_143.plan
index a1597e70674..9ec189dac79 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_143.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_143.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_144.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_144.plan
index a1597e70674..e2dbbe7719e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_144.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_144.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_145.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_145.plan
index a1597e70674..9ec189dac79 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_145.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_145.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_146.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_146.plan
index a1597e70674..e2dbbe7719e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_146.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_146.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_147.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_147.plan
index 114122fe5e4..d0a5fb57a55 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_147.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_147.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_148.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_148.plan
index 114122fe5e4..d0a5fb57a55 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_148.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_148.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_149.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_149.plan
index fd930e904da..a3dba8ba153 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_149.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_149.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_15.plan
index a1597e70674..5e0af56eba5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_150.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_150.plan
index fd930e904da..a3dba8ba153 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_150.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_150.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_151.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_151.plan
index a1597e70674..c76b4d7199a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_151.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_151.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_152.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_152.plan
index a1597e70674..c35f64fb691 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_152.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_152.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col7 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_153.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_153.plan
index a1597e70674..51027b993db 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_153.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_153.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_16.plan
index a1597e70674..99e0b2b6340 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_17.plan
index a1597e70674..b7306dc5207 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_18.plan
index a1597e70674..41566eb2fc3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_19.plan
index a1597e70674..80b1ef92c4b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_2.plan
index f368bce5273..f18cb0d611d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_20.plan
index a1597e70674..41a599f3e18 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_21.plan
index a1597e70674..80b1ef92c4b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_22.plan
index a1597e70674..41f64776b49 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_23.plan
index a1597e70674..80b1ef92c4b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_24.plan
index a1597e70674..872f71bfc41 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_25.plan
index a1597e70674..80b1ef92c4b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_26.plan
index a1597e70674..80b1ef92c4b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_27.plan
index a1597e70674..07eeccd83e9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_28.plan
index a1597e70674..07eeccd83e9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_28.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_28.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_29.plan
index fd930e904da..88b3e79c7dc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_29.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_29.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_3.plan
index f368bce5273..f18cb0d611d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_30.plan
index fd930e904da..fa72234b4f0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_30.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_30.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_31.plan
index fd930e904da..ebf6f306bb4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_31.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_31.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_32.plan
index fd930e904da..b048e3882fd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_32.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_32.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_33.plan
index fd930e904da..dd89ce56af7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_33.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_33.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_34.plan
index fd930e904da..dd89ce56af7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_34.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_34.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_35.plan
index fd930e904da..45195ae2018 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_35.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_35.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_36.plan
index fd930e904da..60fe5522908 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_36.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_36.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_37.plan
index 36dacb34082..6e1c47f2859 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_37.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_37.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_38.plan
index 36dacb34082..7e7550e0096 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_38.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_38.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_39.plan
index a1597e70674..db590a5d04f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_39.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_39.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_4.plan
index f368bce5273..f18cb0d611d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_40.plan
index a1597e70674..db590a5d04f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_40.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_40.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_41.plan
index a1597e70674..62715e39cc5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_41.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_41.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_42.plan
index a1597e70674..62715e39cc5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_42.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_42.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_43.plan
index a1597e70674..3f0b16cf22f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_43.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_43.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_44.plan
index a1597e70674..3f0b16cf22f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_44.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_44.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_45.plan
index 36dacb34082..d0e04e85094 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_45.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_45.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_46.plan
index 36dacb34082..d0e04e85094 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_46.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_46.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_47.plan
index 36dacb34082..62e090d21e7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_47.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_47.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_48.plan
index 36dacb34082..86e106295ee 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_48.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_48.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_49.plan
index 431cd8d709d..97f660e1bb8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_49.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_49.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_5.plan
index a1597e70674..85ce2b9358e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_50.plan
index 431cd8d709d..97f660e1bb8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_50.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_50.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_51.plan
index a1597e70674..26464615729 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_51.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_51.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_52.plan
index a1597e70674..58ba425da65 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_52.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_52.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_53.plan
index a1597e70674..26464615729 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_53.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_53.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_54.plan
index a1597e70674..58ba425da65 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_54.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_54.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_55.plan
index a1597e70674..26464615729 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_55.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_55.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_56.plan
index a1597e70674..b2c5a67ce54 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_56.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_56.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_57.plan
index a1597e70674..26464615729 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_57.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_57.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_58.plan
index a1597e70674..4e215092cad 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_58.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_58.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_59.plan
index d0266143a30..872b505bfb3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_59.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_59.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_6.plan
index a1597e70674..85ce2b9358e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_60.plan
index d0266143a30..872b505bfb3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_60.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_60.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_61.plan
index fd930e904da..6aeb3026170 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_61.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_61.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_62.plan
index fd930e904da..4ec39247dcc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_62.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_62.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_63.plan
index a1597e70674..e338b6e0e55 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_63.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_63.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_64.plan
index a1597e70674..e338b6e0e55 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_64.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_64.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_65.plan
index a1597e70674..28b18e53154 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_65.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_65.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_66.plan
index a1597e70674..28b18e53154 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_66.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_66.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_67.plan
index a1597e70674..3cd13a7a9ca 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_67.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_67.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_68.plan
index a1597e70674..d6f91082d76 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_68.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_68.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_69.plan
index a1597e70674..90db92315ae 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_69.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_69.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_7.plan
index f4c7d6ee1ba..1b2459b252e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_70.plan
index a1597e70674..d5a141d8887 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_70.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_70.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_71.plan
index a1597e70674..3cd13a7a9ca 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_71.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_71.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_72.plan
index a1597e70674..5456d20c41f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_72.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_72.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_73.plan
index 36dacb34082..0b945175c62 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_73.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_73.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_74.plan
index 36dacb34082..48af1d748cf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_74.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_74.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_75.plan
index a1597e70674..c76b4d7199a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_75.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_75.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_76.plan
index a1597e70674..115c067114b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_76.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_76.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_77.plan
index 36dacb34082..79c22b63434 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_77.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_77.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... And ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_78.plan
index 36dacb34082..79c22b63434 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_78.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_78.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... And ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_79.plan
index 36dacb34082..79c22b63434 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_79.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_79.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... And ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_8.plan
index f4c7d6ee1ba..1b2459b252e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_80.plan
index 36dacb34082..b2d9725a522 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_80.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_80.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... And ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_81.plan
index 36dacb34082..c38b8009a49 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_81.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_81.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_82.plan
index 36dacb34082..b8c34253c9b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_82.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_82.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_83.plan
index a1597e70674..d16698ea628 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_83.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_83.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_84.plan
index a1597e70674..92d1172cefa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_84.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_84.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_85.plan
index 36dacb34082..a7c08a4fb90 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_85.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_85.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_86.plan
index 36dacb34082..af2ece0e2f6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_86.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_86.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-12.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_87.plan
index a1597e70674..d16698ea628 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_87.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_87.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_88.plan
index a1597e70674..aee74ab5190 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_88.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_88.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_89.plan
index d4157eb18f6..1f7d32e5345 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_89.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_89.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_9.plan
index a1597e70674..7feccd00029 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_90.plan
index d4157eb18f6..1f7d32e5345 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_90.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_90.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_91.plan
index f4c7d6ee1ba..634d451c7c3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_91.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_91.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_92.plan
index f4c7d6ee1ba..2fc7fada61c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_92.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_92.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_93.plan
index f4c7d6ee1ba..634d451c7c3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_93.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_93.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_94.plan
index f4c7d6ee1ba..2fc7fada61c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_94.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_94.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_95.plan
index f4c7d6ee1ba..634d451c7c3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_95.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_95.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_96.plan
index f4c7d6ee1ba..634d451c7c3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_96.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_96.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_97.plan
index 6c17a55c4fd..53f2ce441a8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_97.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_97.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_98.plan
index 6c17a55c4fd..53f2ce441a8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_98.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_98.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_99.plan
index a1597e70674..5897d7f7a2b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_99.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_99.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-12.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-12.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-12.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_1.plan
index 589d5ede349..7ff3d8133c3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_10.plan
index 899ef2900d5..c024514fc7e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-13.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_100.plan
index 589d5ede349..7f0c48b6632 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_100.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_100.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_101.plan
index 589d5ede349..ac61c403bdd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_101.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_101.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_102.plan
index 589d5ede349..7f0c48b6632 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_102.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_102.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_103.plan
index 589d5ede349..7f0c48b6632 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_103.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_103.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_104.plan
index 589d5ede349..b40f728768f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_104.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_104.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_105.plan
index 589d5ede349..5f69998f513 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_105.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_105.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_106.plan
index 589d5ede349..4a2aab994b9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_106.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_106.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_11.plan
index 899ef2900d5..fbf0417fb38 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-13.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_12.plan
index 899ef2900d5..a31c91211a1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-13.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_13.plan
index 899ef2900d5..55af52b0b73 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-13.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_14.plan
index 899ef2900d5..a697e082cd8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-13.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_15.plan
index 899ef2900d5..078dfa67e49 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-13.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_16.plan
index 899ef2900d5..75f6c9e8df1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-13.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_17.plan
index 899ef2900d5..cb81bc9f82d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-13.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_18.plan
index 9e72ab4f2ce..81ce2d63251 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_19.plan
index 9e72ab4f2ce..81ce2d63251 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_2.plan
index 589d5ede349..e2d2c4de121 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_20.plan
index 36f529fe450..fe09b28b688 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_21.plan
index 36f529fe450..359dd7e4033 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_22.plan
index 1317e656654..c5fc3f75bba 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_23.plan
index 1317e656654..c5fc3f75bba 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_24.plan
index 899ef2900d5..4fe7823ea1f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-13.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_25.plan
index 899ef2900d5..ea1a035b261 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-13.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_26.plan
index 899ef2900d5..4fe7823ea1f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-13.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_27.plan
index 899ef2900d5..4fe7823ea1f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-13.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_28.plan
index 1317e656654..c9a0a255159 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_28.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_28.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_29.plan
index 1317e656654..c9a0a255159 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_29.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_29.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_3.plan
index 589d5ede349..516b7d684cb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_30.plan
index 1317e656654..c5fc3f75bba 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_30.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_30.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_31.plan
index 1317e656654..c5fc3f75bba 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_31.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_31.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_32.plan
index 36f529fe450..bd68e80676d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_32.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_32.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_33.plan
index 36f529fe450..bd68e80676d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_33.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_33.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_34.plan
index 899ef2900d5..58258cee8c9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_34.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_34.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-13.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_35.plan
index 899ef2900d5..0b16f5c1967 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_35.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_35.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-13.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_36.plan
index 899ef2900d5..f689e91a416 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_36.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_36.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150 And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-13.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_37.plan
index 899ef2900d5..dcad793bfd3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_37.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_37.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150 And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-13.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_38.plan
index 899ef2900d5..7a3dbf2e73e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_38.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_38.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-13.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_39.plan
index 899ef2900d5..a53fb712471 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_39.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_39.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-13.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_4.plan
index 589d5ede349..dd4ce32a5f1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_40.plan
index 7938aeb04ae..f539637aaf7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_40.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_40.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_41.plan
index 7938aeb04ae..0f962110ba2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_41.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_41.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_42.plan
index 589d5ede349..dcbf1ab530a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_42.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_42.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_43.plan
index 589d5ede349..dcbf1ab530a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_43.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_43.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_44.plan
index 589d5ede349..e2d504e6ff0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_44.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_44.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_45.plan
index 589d5ede349..e2d504e6ff0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_45.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_45.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_46.plan
index 589d5ede349..add42b925ef 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_46.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_46.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_47.plan
index 589d5ede349..4f7534b1f34 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_47.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_47.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_48.plan
index 589d5ede349..2eb777b213e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_48.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_48.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_49.plan
index 589d5ede349..2635c910365 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_49.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_49.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_5.plan
index 589d5ede349..9c2fe04be8d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_50.plan
index 589d5ede349..add42b925ef 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_50.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_50.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_51.plan
index 589d5ede349..6b35d02e1bd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_51.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_51.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_52.plan
index 9e72ab4f2ce..7729efa0fd1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_52.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_52.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_53.plan
index 9e72ab4f2ce..55a539c1111 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_53.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_53.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_54.plan
index 9e72ab4f2ce..d708d5035d2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_54.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_54.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_55.plan
index 9e72ab4f2ce..7f712d6e881 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_55.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_55.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_56.plan
index 589d5ede349..55e7d3ad68e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_56.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_56.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_57.plan
index 589d5ede349..6f9a8378a77 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_57.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_57.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_58.plan
index 589d5ede349..929211a1f59 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_58.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_58.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_59.plan
index 589d5ede349..929211a1f59 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_59.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_59.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_6.plan
index 589d5ede349..4451107eb47 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_60.plan
index 589d5ede349..929211a1f59 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_60.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_60.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_61.plan
index 589d5ede349..929211a1f59 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_61.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_61.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_62.plan
index 8d0c7ec2ec2..bf5c16083d5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_62.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_62.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-13.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_63.plan
index 8d0c7ec2ec2..bf5c16083d5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_63.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_63.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-13.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_64.plan
index 589d5ede349..c3fd3aad863 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_64.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_64.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_65.plan
index 589d5ede349..ee2a1ad8f5e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_65.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_65.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_66.plan
index 589d5ede349..590e08d0b0c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_66.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_66.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_67.plan
index 589d5ede349..fdd0dc3d57b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_67.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_67.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_68.plan
index 589d5ede349..2dfa9ba49b3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_68.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_68.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_69.plan
index 589d5ede349..129c1b12a50 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_69.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_69.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_7.plan
index 589d5ede349..711a40e240a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_70.plan
index 589d5ede349..318a7c52d63 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_70.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_70.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_71.plan
index 589d5ede349..654d3980ae4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_71.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_71.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_72.plan
index 7938aeb04ae..f539637aaf7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_72.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_72.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_73.plan
index 7938aeb04ae..8e6a3ba6dd8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_73.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_73.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_74.plan
index 589d5ede349..0805a5080a7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_74.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_74.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_75.plan
index 589d5ede349..99523b5c42f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_75.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_75.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_76.plan
index 7938aeb04ae..b4922e39b20 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_76.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_76.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_77.plan
index 7938aeb04ae..1b657b57b37 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_77.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_77.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_78.plan
index 589d5ede349..1972bf78099 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_78.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_78.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_79.plan
index 589d5ede349..a0ed1d1370a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_79.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_79.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_8.plan
index 899ef2900d5..d0e6153aae1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-13.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_80.plan
index 589d5ede349..1972bf78099 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_80.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_80.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_81.plan
index 589d5ede349..cfee93279d7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_81.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_81.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_82.plan
index 589d5ede349..1972bf78099 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_82.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_82.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_83.plan
index 589d5ede349..8214df100e5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_83.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_83.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_84.plan
index 589d5ede349..01616db61a4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_84.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_84.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_85.plan
index 589d5ede349..01616db61a4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_85.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_85.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_86.plan
index 589d5ede349..01616db61a4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_86.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_86.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_87.plan
index 589d5ede349..01616db61a4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_87.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_87.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_88.plan
index 589d5ede349..55e7d3ad68e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_88.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_88.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_89.plan
index 589d5ede349..55e7d3ad68e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_89.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_89.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_9.plan
index 899ef2900d5..7a9c33e24b5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-13.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_90.plan
index 9e72ab4f2ce..638a8876c3f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_90.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_90.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_91.plan
index 9e72ab4f2ce..a6b1791b674 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_91.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_91.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_92.plan
index 9e72ab4f2ce..68d28e812d4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_92.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_92.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_93.plan
index 9e72ab4f2ce..68d28e812d4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_93.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_93.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_94.plan
index 589d5ede349..523e51005ec 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_94.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_94.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_95.plan
index 589d5ede349..6acec99d13d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_95.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_95.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_96.plan
index 589d5ede349..5c4740e8f54 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_96.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_96.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_97.plan
index 589d5ede349..5c4740e8f54 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_97.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_97.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_98.plan
index 589d5ede349..ded2f514fa5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_98.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_98.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_99.plan
index 589d5ede349..634d003917b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_99.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_99.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-13.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-13.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-13.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_1.plan
index a1140282986..e3f1ecdbebd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_10.plan
index a1140282986..a7c4bea0580 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_100.plan
index a1140282986..5f1fb3fe31b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_100.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_100.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_101.plan
index a1140282986..83bfcd34bd5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_101.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_101.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_102.plan
index 8fc9e57b32f..b5355d29fe9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_102.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_102.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_103.plan
index 8fc9e57b32f..eccdc41780b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_103.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_103.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_104.plan
index a1140282986..a8b9d712eb8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_104.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_104.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_105.plan
index a1140282986..3f03ac0393b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_105.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_105.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_11.plan
index a1140282986..9303f774cc5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_12.plan
index a1140282986..f700429ac23 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_13.plan
index a1140282986..f700429ac23 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_14.plan
index a1140282986..99c1393cc3c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_15.plan
index a1140282986..b1c0bf2589c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_16.plan
index a1140282986..dfab4820a19 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_17.plan
index a1140282986..f54225ba62f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_18.plan
index a1140282986..dd02d7e4b62 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_19.plan
index a1140282986..c38d4281c60 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_2.plan
index a1140282986..0ce7c928620 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_20.plan
index a1140282986..dd02d7e4b62 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_21.plan
index a1140282986..c38d4281c60 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_22.plan
index f0bd0592705..3b49ef436ac 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-14.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_23.plan
index f0bd0592705..fd300e923f9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-14.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_24.plan
index a1140282986..b97c37512a7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_25.plan
index a1140282986..b97c37512a7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_26.plan
index 5c312c28c13..34a558403d0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 \\u003C 110 Or items2 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_27.plan
index 5c312c28c13..b9d8098042d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 \\u003C 110 Or items2 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_28.plan
index f0bd0592705..ffbfdc3aabf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_28.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_28.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-14.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_29.plan
index f0bd0592705..a96b5362372 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_29.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_29.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-14.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_3.plan
index a1140282986..0ce7c928620 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_30.plan
index f0bd0592705..ffbfdc3aabf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_30.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_30.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-14.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_31.plan
index f0bd0592705..e9ee629880f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_31.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_31.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-14.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_32.plan
index 1ff49778dd2..c511bd52e31 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_32.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_32.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_33.plan
index 1ff49778dd2..c511bd52e31 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_33.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_33.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_34.plan
index a1140282986..2d30bb3cc36 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_34.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_34.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_35.plan
index a1140282986..0231d981de0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_35.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_35.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_36.plan
index 74d90a3aa74..c2ad3e321b6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_36.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_36.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_37.plan
index 74d90a3aa74..c2ad3e321b6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_37.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_37.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_38.plan
index 74d90a3aa74..c2ad3e321b6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_38.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_38.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_39.plan
index 74d90a3aa74..a6363ba60a6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_39.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_39.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_4.plan
index a1140282986..1cfcc369ca5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_40.plan
index 8b2e4717539..6edc8babc33 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_40.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_40.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_41.plan
index 8b2e4717539..6edc8babc33 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_41.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_41.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_42.plan
index a1140282986..d0dac6b3ab8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_42.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_42.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_43.plan
index a1140282986..8a25adcf9af 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_43.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_43.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_44.plan
index a1140282986..b23f97bdd07 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_44.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_44.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_45.plan
index a1140282986..b23f97bdd07 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_45.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_45.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_46.plan
index a1140282986..b23f97bdd07 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_46.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_46.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_47.plan
index a1140282986..b23f97bdd07 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_47.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_47.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_48.plan
index a1140282986..b23f97bdd07 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_48.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_48.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_49.plan
index a1140282986..b23f97bdd07 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_49.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_49.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_5.plan
index a1140282986..1cfcc369ca5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_50.plan
index 74d90a3aa74..1d405d8731c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_50.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_50.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_51.plan
index 74d90a3aa74..115ca445f14 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_51.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_51.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_52.plan
index a1140282986..4026e0eaa8a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_52.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_52.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_53.plan
index a1140282986..713cab6fc07 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_53.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_53.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_54.plan
index a1140282986..0f73e4fa5b3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_54.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_54.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_55.plan
index a1140282986..f7d8e273641 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_55.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_55.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_56.plan
index a1140282986..0f73e4fa5b3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_56.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_56.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_57.plan
index a1140282986..69f621f9fe8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_57.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_57.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_58.plan
index 74d90a3aa74..0d9a5a57b2d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_58.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_58.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_59.plan
index 74d90a3aa74..db285deefeb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_59.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_59.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_6.plan
index a1140282986..0db60e36553 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_60.plan
index 98d109562fc..80f353ca28c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_60.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_60.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-14.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_61.plan
index 98d109562fc..7901ad0678b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_61.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_61.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-14.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_62.plan
index a1140282986..a8b9d712eb8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_62.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_62.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_63.plan
index a1140282986..a8b9d712eb8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_63.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_63.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_64.plan
index a1140282986..a8b9d712eb8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_64.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_64.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_65.plan
index a1140282986..a8b9d712eb8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_65.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_65.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_66.plan
index 74d90a3aa74..9c97e8653f8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_66.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_66.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_67.plan
index 74d90a3aa74..9c97e8653f8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_67.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_67.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_68.plan
index 74d90a3aa74..c35fa6d8c8c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_68.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_68.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_69.plan
index 74d90a3aa74..c7eebbaa553 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_69.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_69.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_7.plan
index a1140282986..0db60e36553 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_70.plan
index 74d90a3aa74..c35fa6d8c8c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_70.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_70.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_71.plan
index 74d90a3aa74..7078af2007b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_71.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_71.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_72.plan
index a1140282986..bac52e7462f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_72.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_72.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_73.plan
index a1140282986..ebd7c9a8307 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_73.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_73.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_74.plan
index a1140282986..da87583990e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_74.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_74.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_75.plan
index a1140282986..79bd2b9fc87 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_75.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_75.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_76.plan
index f0bd0592705..8c92bc9b669 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_76.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_76.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-14.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_77.plan
index f0bd0592705..77fe99b9039 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_77.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_77.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-14.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_78.plan
index f0bd0592705..8c92bc9b669 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_78.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_78.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-14.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_79.plan
index f0bd0592705..8c8ad0e54fc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_79.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_79.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-14.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_8.plan
index 8b2e4717539..5b27bfcf8a9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_80.plan
index f0bd0592705..8c92bc9b669 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_80.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_80.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-14.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_81.plan
index f0bd0592705..7b8e9e72f08 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_81.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_81.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-14.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_82.plan
index 75b6a83f43b..2445cece912 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_82.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_82.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_83.plan
index 75b6a83f43b..2445cece912 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_83.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_83.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_84.plan
index 49e5c85f6c4..e6e179aba3e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_84.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_84.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_85.plan
index 49e5c85f6c4..e6e179aba3e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_85.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_85.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_86.plan
index a1140282986..6d9fbba1da3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_86.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_86.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_87.plan
index a1140282986..ccb408ceef2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_87.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_87.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_88.plan
index f0bd0592705..2ec5e521745 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_88.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_88.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-14.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_89.plan
index f0bd0592705..54e74281e11 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_89.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_89.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-14.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_9.plan
index 8b2e4717539..5b27bfcf8a9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_90.plan
index a1140282986..217b06cae7f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_90.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_90.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_91.plan
index a1140282986..220121d64b8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_91.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_91.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_92.plan
index 5c312c28c13..eb6b6794d99 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_92.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_92.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_93.plan
index 5c312c28c13..eb6b6794d99 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_93.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_93.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_94.plan
index 5c312c28c13..acc3adf987d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_94.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_94.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_95.plan
index 5c312c28c13..acc3adf987d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_95.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_95.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_96.plan
index 5c312c28c13..39ddabf90ef 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_96.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_96.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_97.plan
index 5c312c28c13..39ddabf90ef 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_97.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_97.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_98.plan
index 5c312c28c13..eb6b6794d99 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_98.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_98.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_99.plan
index 5c312c28c13..eb6b6794d99 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_99.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_99.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-14.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-14.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-14.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_1.plan
index edf546a78cd..db937e789a1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_10.plan
index edf546a78cd..36453fbf178 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_11.plan
index bdcc6d2049b..0f1e297c036 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-15.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_12.plan
index bdcc6d2049b..8b0dd9505ab 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-15.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_13.plan
index 948308b8e68..0668cdfbcfd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_14.plan
index 948308b8e68..686c2547c95 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_15.plan
index bbe1e1ed3fe..b7e9930ca66 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_16.plan
index bbe1e1ed3fe..b7e9930ca66 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_17.plan
index e246c9b3d81..d79c10865c8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-15.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_18.plan
index e246c9b3d81..d79c10865c8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-15.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_19.plan
index e246c9b3d81..d79c10865c8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-15.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_2.plan
index edf546a78cd..778516431f6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_20.plan
index e246c9b3d81..d79c10865c8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-15.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_21.plan
index edf546a78cd..f23eb18eef9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_22.plan
index edf546a78cd..462144cf452 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_23.plan
index edf546a78cd..f23eb18eef9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_24.plan
index edf546a78cd..8fbfe46b6ea 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_25.plan
index edf546a78cd..f23eb18eef9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_26.plan
index edf546a78cd..93a362b071a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_27.plan
index edf546a78cd..f23eb18eef9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_28.plan
index edf546a78cd..d6f8089ea0b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_28.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_28.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_29.plan
index edf546a78cd..637b5c33400 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_29.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_29.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_3.plan
index 4dea4487a6a..f97249a845a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-15.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_30.plan
index edf546a78cd..c1b0ffdd79f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_30.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_30.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_31.plan
index edf546a78cd..32b1252fbb2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_31.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_31.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_32.plan
index edf546a78cd..32b1252fbb2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_32.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_32.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_33.plan
index edf546a78cd..83a9314d31a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_33.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_33.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_34.plan
index edf546a78cd..83a9314d31a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_34.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_34.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_35.plan
index edf546a78cd..fc9535a9bad 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_35.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_35.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_36.plan
index edf546a78cd..fc9535a9bad 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_36.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_36.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_37.plan
index edf546a78cd..0c1b66646f7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_37.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_37.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_38.plan
index edf546a78cd..0c1b66646f7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_38.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_38.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_4.plan
index 4dea4487a6a..ee249aa6331 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-15.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_5.plan
index edf546a78cd..c35d9f8563a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_6.plan
index edf546a78cd..7054bda2b21 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_7.plan
index edf546a78cd..c35d9f8563a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_8.plan
index edf546a78cd..dad1f811408 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_9.plan
index edf546a78cd..be43443c03f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-15.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-15.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-15.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_1.plan
index 0a71dcaa497..d5867e929ce 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_10.plan
index 0b104b32edc..32c57743057 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_100.plan
index a092f52b5f0..3c9b9324926 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_100.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_100.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_101.plan
index a092f52b5f0..0412ef96c90 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_101.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_101.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_102.plan
index 18e9f27cbe7..83cfb578d43 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_102.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_102.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_103.plan
index 18e9f27cbe7..9302889dca1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_103.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_103.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_104.plan
index 18e9f27cbe7..c653766eb60 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_104.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_104.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_105.plan
index 18e9f27cbe7..c653766eb60 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_105.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_105.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_106.plan
index 0a71dcaa497..e71e7d9c126 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_106.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_106.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_107.plan
index 0a71dcaa497..35200bb09a7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_107.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_107.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_108.plan
index 0a71dcaa497..f7cbd3c7c4e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_108.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_108.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_109.plan
index 0a71dcaa497..f7cbd3c7c4e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_109.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_109.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_11.plan
index 0b104b32edc..32c57743057 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_110.plan
index 0a71dcaa497..be36912734d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_110.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_110.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_111.plan
index 0a71dcaa497..be36912734d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_111.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_111.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_112.plan
index 0a71dcaa497..f2e4c3000e8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_112.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_112.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_113.plan
index 0a71dcaa497..f2e4c3000e8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_113.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_113.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_114.plan
index 0b104b32edc..32c57743057 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_114.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_114.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_115.plan
index 0b104b32edc..32c57743057 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_115.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_115.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_116.plan
index 0a71dcaa497..7fefe2335be 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_116.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_116.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_117.plan
index 0a71dcaa497..7fefe2335be 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_117.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_117.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_118.plan
index 0b104b32edc..72c8444c7e6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_118.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_118.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_119.plan
index 0b104b32edc..c3aa85b1108 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_119.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_119.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_12.plan
index a092f52b5f0..f4ed7b075f3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_120.plan
index 0a71dcaa497..f62096e701d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_120.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_120.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_121.plan
index 0a71dcaa497..854ee9eb0e3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_121.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_121.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_122.plan
index 0a71dcaa497..34eb0872247 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_122.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_122.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_123.plan
index 0a71dcaa497..db992bfd612 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_123.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_123.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_124.plan
index 0a71dcaa497..f884b708baa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_124.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_124.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_125.plan
index 0a71dcaa497..f884b708baa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_125.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_125.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_126.plan
index 0a71dcaa497..58dfab9709b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_126.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_126.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_127.plan
index 0a71dcaa497..45930017b6e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_127.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_127.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_128.plan
index 0a71dcaa497..bdd7f8ad86b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_128.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_128.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_129.plan
index 0a71dcaa497..101641ad2db 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_129.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_129.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_13.plan
index a092f52b5f0..c117b3bf076 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_130.plan
index 0a71dcaa497..0090a5e9a46 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_130.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_130.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_131.plan
index 0a71dcaa497..028beeda114 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_131.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_131.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_132.plan
index 0a71dcaa497..0090a5e9a46 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_132.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_132.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_133.plan
index 0a71dcaa497..028beeda114 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_133.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_133.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_134.plan
index 0a71dcaa497..0090a5e9a46 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_134.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_134.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_135.plan
index 0a71dcaa497..a0f90b75409 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_135.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_135.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_136.plan
index 0a71dcaa497..d6f94af7979 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_136.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_136.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_137.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_137.plan
index 0a71dcaa497..47c5365da3c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_137.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_137.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_138.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_138.plan
index 0b104b32edc..f8755923789 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_138.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_138.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_139.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_139.plan
index 0b104b32edc..afb82087ea0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_139.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_139.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_14.plan
index c9e600ef5c2..72081b36b8b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_140.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_140.plan
index a092f52b5f0..7f7ad4f1708 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_140.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_140.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_141.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_141.plan
index a092f52b5f0..1e585e0f83e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_141.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_141.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_142.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_142.plan
index 0b104b32edc..fb14f3a924d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_142.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_142.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_143.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_143.plan
index 0b104b32edc..fb14f3a924d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_143.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_143.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_144.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_144.plan
index 0a71dcaa497..94d4f8ad149 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_144.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_144.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_145.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_145.plan
index 0a71dcaa497..bcd7cd14a8b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_145.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_145.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_15.plan
index c9e600ef5c2..e7a80b9c38e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_16.plan
index c9e600ef5c2..4c4c141ade4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_17.plan
index c9e600ef5c2..c99e7e51946 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_18.plan
index 0b104b32edc..916bab98878 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_19.plan
index 0b104b32edc..e42e6266834 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_2.plan
index 0a71dcaa497..ddd199e45a9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_20.plan
index 0a71dcaa497..e06e3ca463d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_21.plan
index 0a71dcaa497..50d3f6530be 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_22.plan
index a092f52b5f0..6db700a35d5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_23.plan
index a092f52b5f0..56096c1c118 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_24.plan
index a092f52b5f0..911d28ff8f9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_25.plan
index a092f52b5f0..8a8e5d15702 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_26.plan
index 0a71dcaa497..a6e53a46db9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_27.plan
index 0a71dcaa497..8db19eecef8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_28.plan
index 0a71dcaa497..87f3c2bac1b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_28.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_28.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_29.plan
index 0a71dcaa497..628472be5b6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_29.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_29.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_3.plan
index 0a71dcaa497..27b8fcda83a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_30.plan
index 0a71dcaa497..ea54dc8b7e2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_30.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_30.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_31.plan
index 0a71dcaa497..10d9ca30501 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_31.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_31.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_32.plan
index 0a71dcaa497..ea54dc8b7e2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_32.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_32.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_33.plan
index 0a71dcaa497..ea54dc8b7e2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_33.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_33.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_34.plan
index 0a71dcaa497..ea54dc8b7e2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_34.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_34.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_35.plan
index 0a71dcaa497..10d9ca30501 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_35.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_35.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_36.plan
index 0b104b32edc..d81bd80a8cc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_36.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_36.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_37.plan
index 0b104b32edc..94c46a1cb0c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_37.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_37.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_38.plan
index 0a71dcaa497..d6f94af7979 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_38.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_38.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_39.plan
index 0a71dcaa497..47c5365da3c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_39.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_39.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_4.plan
index 0a71dcaa497..7eac4b2df50 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_40.plan
index a092f52b5f0..ea10f5b7fdd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_40.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_40.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_41.plan
index a092f52b5f0..2557a663335 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_41.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_41.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_42.plan
index 0a71dcaa497..e06e3ca463d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_42.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_42.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_43.plan
index 0a71dcaa497..75480f7e73f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_43.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_43.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_44.plan
index 79fc27af880..6be7091a11c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_44.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_44.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_45.plan
index 79fc27af880..aae9ccfb3f9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_45.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_45.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_46.plan
index 0a71dcaa497..887fc1170fa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_46.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_46.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_47.plan
index 0a71dcaa497..50efb8feb73 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_47.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_47.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_48.plan
index 0a71dcaa497..887fc1170fa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_48.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_48.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_49.plan
index 0a71dcaa497..54f95ddad03 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_49.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_49.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_5.plan
index 0a71dcaa497..b6929f788c8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_50.plan
index 0a71dcaa497..887fc1170fa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_50.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_50.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_51.plan
index 0a71dcaa497..d12e6d4a569 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_51.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_51.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_52.plan
index 0a71dcaa497..e06e3ca463d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_52.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_52.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_53.plan
index 0a71dcaa497..f2d95688b05 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_53.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_53.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_54.plan
index aeac975da73..5cd0eb006fa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_54.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_54.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_55.plan
index aeac975da73..02a99ad151b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_55.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_55.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_56.plan
index 0a71dcaa497..f980b938c2d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_56.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_56.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_57.plan
index 0a71dcaa497..55f1036b8eb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_57.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_57.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_58.plan
index 0a71dcaa497..ef8e8972e89 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_58.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_58.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_59.plan
index 0a71dcaa497..aa6efeff0d3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_59.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_59.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_6.plan
index d96ec14dc72..943a0d59de6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_60.plan
index 0a71dcaa497..c4f593fd1f8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_60.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_60.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_61.plan
index 0a71dcaa497..ca50b6fed14 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_61.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_61.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_62.plan
index 0a71dcaa497..c4f593fd1f8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_62.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_62.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_63.plan
index 0a71dcaa497..b1d37b125e4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_63.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_63.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_64.plan
index a092f52b5f0..362cab2db99 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_64.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_64.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_65.plan
index a092f52b5f0..6185e2c0bdd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_65.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_65.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_66.plan
index a092f52b5f0..b91ef0c97e7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_66.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_66.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_67.plan
index a092f52b5f0..7dfb32499fb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_67.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_67.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_68.plan
index 0a71dcaa497..a8970151709 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_68.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_68.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_69.plan
index 0a71dcaa497..b1a8ba7d9da 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_69.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_69.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_7.plan
index d96ec14dc72..943a0d59de6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_70.plan
index 0a71dcaa497..a0f5af006b0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_70.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_70.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_71.plan
index 0a71dcaa497..8fb824cb8d2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_71.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_71.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_72.plan
index a092f52b5f0..05402f4926e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_72.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_72.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_73.plan
index a092f52b5f0..f11521e27e1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_73.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_73.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_74.plan
index 18e9f27cbe7..f7d95666730 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_74.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_74.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_75.plan
index 18e9f27cbe7..f7d95666730 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_75.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_75.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_76.plan
index 0a71dcaa497..a8970151709 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_76.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_76.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_77.plan
index 0a71dcaa497..6845aee6812 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_77.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_77.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_78.plan
index 0a71dcaa497..6815d531b79 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_78.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_78.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_79.plan
index 0a71dcaa497..ba13472d75b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_79.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_79.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_8.plan
index e69dbfb4a23..8b5a5b058af 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_80.plan
index 0a71dcaa497..6815d531b79 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_80.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_80.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_81.plan
index 0a71dcaa497..d9bfcc125b8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_81.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_81.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_82.plan
index 0a71dcaa497..6815d531b79 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_82.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_82.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_83.plan
index 0a71dcaa497..302a5be906c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_83.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_83.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_84.plan
index 0a71dcaa497..447d7a50858 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_84.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_84.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_85.plan
index 0a71dcaa497..ab0a2104f66 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_85.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_85.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_86.plan
index 0a71dcaa497..9614f188371 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_86.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_86.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_87.plan
index 0a71dcaa497..9614f188371 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_87.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_87.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_88.plan
index 0a71dcaa497..a66b3cc002b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_88.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_88.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_89.plan
index 0a71dcaa497..a66b3cc002b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_89.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_89.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_9.plan
index e69dbfb4a23..8b5a5b058af 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_90.plan
index 0a71dcaa497..b0032be47fd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_90.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_90.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_91.plan
index 0a71dcaa497..b0032be47fd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_91.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_91.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_92.plan
index 0a71dcaa497..34eb0872247 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_92.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_92.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_93.plan
index 0a71dcaa497..2f8c860cb2c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_93.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_93.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_94.plan
index aeac975da73..da21d29be90 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_94.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_94.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_95.plan
index aeac975da73..c9349d0d732 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_95.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_95.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_96.plan
index 1580fd90b26..5363a9af93c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_96.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_96.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_97.plan
index 1580fd90b26..5363a9af93c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_97.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_97.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_98.plan
index a092f52b5f0..05402f4926e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_98.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_98.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_99.plan
index a092f52b5f0..147d87f0446 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_99.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_99.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-2.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-2.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-2.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-2.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_1.plan
index 29a220f7d9a..b58b10bfb26 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_10.plan
index d392cb88d13..d6467c4ac65 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_100.plan
index 29a220f7d9a..efdd103d759 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_100.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_100.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_101.plan
index 29a220f7d9a..cfaa30ac9c1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_101.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_101.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_102.plan
index 29a220f7d9a..db59fb18232 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_102.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_102.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_103.plan
index d392cb88d13..9c372003fc1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_103.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_103.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_104.plan
index d392cb88d13..2a825722c3e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_104.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_104.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_105.plan
index d392cb88d13..9c372003fc1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_105.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_105.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_106.plan
index d392cb88d13..bccc7f13754 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_106.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_106.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_107.plan
index 9318da65c30..6e4269d6c20 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_107.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_107.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_108.plan
index 9318da65c30..b643b7a2005 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_108.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_108.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_109.plan
index d392cb88d13..a6220301680 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_109.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_109.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_11.plan
index d392cb88d13..a6220301680 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_110.plan
index d392cb88d13..d4022668842 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_110.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_110.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_111.plan
index d392cb88d13..a6220301680 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_111.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_111.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_112.plan
index d392cb88d13..6cab80fa255 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_112.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_112.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_113.plan
index 18ac08db8e1..b93c298a72f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_113.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_113.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_114.plan
index 18ac08db8e1..a7cf2577992 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_114.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_114.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_115.plan
index d392cb88d13..0220db537a2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_115.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_115.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_116.plan
index d392cb88d13..4658c42dfef 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_116.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_116.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_117.plan
index 98faffd8977..2d2aacc6332 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_117.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_117.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_118.plan
index 98faffd8977..2d2aacc6332 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_118.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_118.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_119.plan
index 694b97b7c24..7d6dadb1146 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_119.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_119.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_12.plan
index d392cb88d13..d4022668842 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_120.plan
index 694b97b7c24..5538876c789 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_120.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_120.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_121.plan
index d392cb88d13..30bc73dca32 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_121.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_121.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_122.plan
index d392cb88d13..36ab383c880 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_122.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_122.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_123.plan
index 6b7f08be52e..14ca2c76962 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_123.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_123.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_124.plan
index 6b7f08be52e..14ca2c76962 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_124.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_124.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_125.plan
index 6b7f08be52e..04e500f3953 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_125.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_125.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_126.plan
index 6b7f08be52e..10630a63960 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_126.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_126.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_127.plan
index d392cb88d13..ddecc248475 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_127.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_127.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_13.plan
index d392cb88d13..a6220301680 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_14.plan
index d392cb88d13..8ab55ed895e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_15.plan
index d392cb88d13..b26b37d0adb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_16.plan
index d392cb88d13..fc401ec3a90 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_17.plan
index 98faffd8977..901d3cdf8b0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_18.plan
index 98faffd8977..901d3cdf8b0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_19.plan
index d392cb88d13..e20e36aaae8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_2.plan
index 29a220f7d9a..a43fb8937d6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_20.plan
index d392cb88d13..2216a939352 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_21.plan
index d392cb88d13..e20e36aaae8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_22.plan
index d392cb88d13..9a2fc5ec460 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_23.plan
index 5f7e08cf515..8e4d7f4b8e7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 \\u003C 110 Or items2 \\u003E 150 Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_24.plan
index 5f7e08cf515..8e4d7f4b8e7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 \\u003C 110 Or items2 \\u003E 150 Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_25.plan
index 5f7e08cf515..4fa048b72e3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items2 \\u003C 110 Or items2 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_26.plan
index 5f7e08cf515..4fa048b72e3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items2 \\u003C 110 Or items2 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_27.plan
index d392cb88d13..b26b37d0adb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_28.plan
index d392cb88d13..99136d1b910 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_28.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_28.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_29.plan
index 29a220f7d9a..ce709edfded 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_29.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_29.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_3.plan
index 29a220f7d9a..b58b10bfb26 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_30.plan
index 29a220f7d9a..ba1720b5b01 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_30.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_30.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_31.plan
index d392cb88d13..f7aeb49f7ed 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_31.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_31.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_32.plan
index d392cb88d13..d626af98d5d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_32.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_32.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_33.plan
index d392cb88d13..d6454927a9f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_33.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_33.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_34.plan
index d392cb88d13..09c7871ec31 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_34.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_34.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_35.plan
index d392cb88d13..8938b3c5a8a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_35.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_35.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_36.plan
index d392cb88d13..8938b3c5a8a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_36.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_36.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_37.plan
index d392cb88d13..47b9ef007ea 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_37.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_37.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_38.plan
index d392cb88d13..17f2b04ffde 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_38.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_38.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_39.plan
index d392cb88d13..88f73965f5d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_39.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_39.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_4.plan
index 29a220f7d9a..bb4869439c9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_40.plan
index d392cb88d13..e36f44dfb22 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_40.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_40.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_41.plan
index 4b9b0b7b703..7a688c11a91 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_41.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_41.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_42.plan
index 4b9b0b7b703..7a688c11a91 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_42.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_42.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_43.plan
index 29a220f7d9a..ce709edfded 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_43.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_43.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_44.plan
index 29a220f7d9a..a5021fce5a2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_44.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_44.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_45.plan
index 29a220f7d9a..ce709edfded 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_45.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_45.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_46.plan
index 29a220f7d9a..fb795acc4bf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_46.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_46.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_47.plan
index d392cb88d13..7c80240af69 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_47.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_47.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_48.plan
index d392cb88d13..45b2eeb8299 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_48.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_48.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_49.plan
index d392cb88d13..3da68f124ff 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_49.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_49.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_5.plan
index d392cb88d13..576d5975e63 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_50.plan
index d392cb88d13..d3d7908cf63 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_50.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_50.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_51.plan
index d392cb88d13..82059ab435b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_51.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_51.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_52.plan
index d392cb88d13..cbd70453c06 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_52.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_52.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_53.plan
index d392cb88d13..ea69f91cb81 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_53.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_53.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_54.plan
index d392cb88d13..b76b63aab4a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_54.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_54.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_55.plan
index d392cb88d13..ea69f91cb81 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_55.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_55.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_56.plan
index d392cb88d13..36cd182744c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_56.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_56.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_57.plan
index 5f7e08cf515..9e6ce3ee593 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_57.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_57.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_58.plan
index 5f7e08cf515..9e6ce3ee593 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_58.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_58.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_59.plan
index 5f7e08cf515..0ea7e5961e2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_59.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_59.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_6.plan
index d392cb88d13..8a09c5695bd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_60.plan
index 5f7e08cf515..0ea7e5961e2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_60.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_60.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_61.plan
index d392cb88d13..582095bd24e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_61.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_61.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_62.plan
index d392cb88d13..582095bd24e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_62.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_62.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_63.plan
index d392cb88d13..0c23d64b657 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_63.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_63.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_64.plan
index d392cb88d13..0c23d64b657 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_64.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_64.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_65.plan
index d392cb88d13..0c23d64b657 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_65.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_65.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_66.plan
index d392cb88d13..0c23d64b657 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_66.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_66.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_67.plan
index d392cb88d13..0c23d64b657 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_67.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_67.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_68.plan
index d392cb88d13..0c23d64b657 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_68.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_68.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_69.plan
index d392cb88d13..0c23d64b657 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_69.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_69.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_7.plan
index d392cb88d13..576d5975e63 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_70.plan
index d392cb88d13..0c23d64b657 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_70.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_70.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_71.plan
index badb5e9a864..0e65a63261d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_71.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_71.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_72.plan
index badb5e9a864..0e65a63261d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_72.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_72.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_73.plan
index 18ac08db8e1..4775ba8f46f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_73.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_73.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_74.plan
index 18ac08db8e1..7f6b30faaa8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_74.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_74.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_75.plan
index d392cb88d13..a9fa53c1fe3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_75.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_75.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_76.plan
index d392cb88d13..f7a5be0dd10 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_76.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_76.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_77.plan
index d392cb88d13..54c816f46a7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_77.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_77.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_78.plan
index d392cb88d13..f6d59a1cd01 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_78.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_78.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_79.plan
index d392cb88d13..73ccf47984e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_79.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_79.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_8.plan
index d392cb88d13..9d7363e7a63 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_80.plan
index d392cb88d13..c965f880e27 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_80.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_80.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_81.plan
index d392cb88d13..582095bd24e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_81.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_81.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_82.plan
index d392cb88d13..6abdc7b8795 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_82.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_82.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_83.plan
index d392cb88d13..225a3afb7d5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_83.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_83.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_84.plan
index d392cb88d13..4838e411f7a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_84.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_84.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_85.plan
index d392cb88d13..53905883fff 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_85.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_85.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_86.plan
index d392cb88d13..53905883fff 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_86.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_86.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_87.plan
index d392cb88d13..52d5269e0b0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_87.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_87.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_88.plan
index d392cb88d13..581062eeadb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_88.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_88.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_89.plan
index d392cb88d13..a8e33bf824c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_89.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_89.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_9.plan
index d392cb88d13..66f01396360 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_90.plan
index d392cb88d13..3c57e816e67 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_90.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_90.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_91.plan
index 18ac08db8e1..32895178924 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_91.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_91.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_92.plan
index 18ac08db8e1..8b7d3893b11 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_92.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_92.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_93.plan
index 4e42b31bcb7..d74cb1d633b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_93.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_93.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_94.plan
index 4e42b31bcb7..0aabd0af679 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_94.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_94.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_95.plan
index d392cb88d13..0220db537a2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_95.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_95.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_96.plan
index d392cb88d13..a298326b0f5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_96.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_96.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_97.plan
index 29a220f7d9a..e7fce469a56 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_97.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_97.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_98.plan
index 29a220f7d9a..4693c98923c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_98.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_98.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col7 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_99.plan
index 29a220f7d9a..e7fce469a56 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_99.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_99.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-3.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-3.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-3.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-3.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_1.plan
index 935744f12d9..015d024e5b0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_10.plan
index 96e9ed02cee..99d8ed10a7a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_100.plan
index 935744f12d9..4a3149f904f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_100.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_100.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_101.plan
index 935744f12d9..b93412a7efe 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_101.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_101.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_11.plan
index 96e9ed02cee..99d8ed10a7a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_12.plan
index 96e9ed02cee..d021b38e35d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_13.plan
index 96e9ed02cee..d021b38e35d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_14.plan
index 5100915c11e..56d927e0c82 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_15.plan
index 5100915c11e..28280d4969a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_16.plan
index f4c1fbb5ea1..8fde4db26c7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_17.plan
index f4c1fbb5ea1..c5efad37192 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_18.plan
index c7ca25bf929..ef649597824 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_19.plan
index c7ca25bf929..ef649597824 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_2.plan
index 3ca97a305f8..2115d4277da 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_20.plan
index 935744f12d9..b1fd226f640 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_21.plan
index 935744f12d9..d40bdf78101 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_22.plan
index 935744f12d9..7746ad559d0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_23.plan
index 935744f12d9..d4bcb9f7e08 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_24.plan
index 935744f12d9..055099c1225 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_25.plan
index 935744f12d9..58596066cb8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_26.plan
index 935744f12d9..055099c1225 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_27.plan
index 935744f12d9..055099c1225 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_28.plan
index f4c1fbb5ea1..27d00cd3b44 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_28.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_28.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_29.plan
index f4c1fbb5ea1..e00c312d2df 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_29.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_29.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_3.plan
index 3ca97a305f8..2115d4277da 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_30.plan
index 935744f12d9..333283b2e20 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_30.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_30.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_31.plan
index 935744f12d9..333283b2e20 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_31.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_31.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_32.plan
index 935744f12d9..625a9596498 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_32.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_32.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_33.plan
index 935744f12d9..625a9596498 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_33.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_33.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_34.plan
index 3045c4b4a6c..ae43923a7e8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_34.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_34.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_35.plan
index 3045c4b4a6c..b3491ed70bb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_35.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_35.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_36.plan
index 935744f12d9..7681e600d4f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_36.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_36.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_37.plan
index 935744f12d9..e76655c00df 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_37.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_37.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_38.plan
index 7a05345b15d..6be3e0fc6f1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_38.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_38.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_39.plan
index 7a05345b15d..6be3e0fc6f1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_39.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_39.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_4.plan
index 3ca97a305f8..2115d4277da 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_40.plan
index 1c5591ff900..e8799f750e1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_40.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_40.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_41.plan
index 1c5591ff900..695063a0307 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_41.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_41.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_42.plan
index 1c5591ff900..37b3c48e458 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_42.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_42.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_43.plan
index 1c5591ff900..37b3c48e458 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_43.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_43.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_44.plan
index 935744f12d9..756e583614c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_44.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_44.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_45.plan
index 935744f12d9..b6fa9af766f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_45.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_45.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_46.plan
index 935744f12d9..607d113e75b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_46.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_46.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_47.plan
index 935744f12d9..56c8aac6e4d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_47.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_47.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_48.plan
index 935744f12d9..0ec85a41983 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_48.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_48.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_49.plan
index 935744f12d9..99253008cd4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_49.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_49.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_5.plan
index 3ca97a305f8..2115d4277da 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_50.plan
index 935744f12d9..b05c35e92fd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_50.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_50.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_51.plan
index 935744f12d9..b4710051107 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_51.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_51.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_52.plan
index 935744f12d9..02af96982a3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_52.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_52.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_53.plan
index 935744f12d9..951c19d3d9d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_53.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_53.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_54.plan
index 935744f12d9..02af96982a3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_54.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_54.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_55.plan
index 935744f12d9..c32898fb356 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_55.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_55.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_56.plan
index 935744f12d9..923f81f6799 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_56.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_56.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_57.plan
index 935744f12d9..34f9550e334 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_57.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_57.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_58.plan
index 5100915c11e..7665ac7cc49 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_58.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_58.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_59.plan
index 5100915c11e..7665ac7cc49 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_59.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_59.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_6.plan
index 935744f12d9..ca44a3d671a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_60.plan
index 935744f12d9..590de1fed9a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_60.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_60.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_61.plan
index 935744f12d9..59452536038 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_61.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_61.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_62.plan
index 935744f12d9..590de1fed9a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_62.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_62.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_63.plan
index 935744f12d9..590de1fed9a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_63.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_63.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_64.plan
index 935744f12d9..590de1fed9a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_64.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_64.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_65.plan
index 935744f12d9..59452536038 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_65.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_65.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_66.plan
index 935744f12d9..7681e600d4f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_66.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_66.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_67.plan
index 935744f12d9..fbe51fafd39 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_67.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_67.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_68.plan
index f4c1fbb5ea1..80ee0c77c79 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_68.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_68.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... Or ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_69.plan
index f4c1fbb5ea1..cd7b83ea453 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_69.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_69.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... Or ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_7.plan
index 935744f12d9..cf06601a6ce 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_70.plan
index f4c1fbb5ea1..501a9cb198f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_70.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_70.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_71.plan
index f4c1fbb5ea1..dd8f01cdae5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_71.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_71.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_72.plan
index 471bcc81a74..ac7e9631ae1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_72.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_72.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 \\u003C 110 Or items2 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_73.plan
index 471bcc81a74..ac7e9631ae1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_73.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_73.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 \\u003C 110 Or items2 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_74.plan
index 471bcc81a74..acc00ce243a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_74.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_74.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items2 \\u003C 110 Or items2 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_75.plan
index 471bcc81a74..acc00ce243a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_75.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_75.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items2 \\u003C 110 Or items2 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_76.plan
index d800dcd500d..c42642a8144 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_76.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_76.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_77.plan
index d800dcd500d..c42642a8144 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_77.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_77.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-4.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_78.plan
index 935744f12d9..c247f7c33d5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_78.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_78.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_79.plan
index 935744f12d9..fd56db70e46 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_79.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_79.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_8.plan
index 935744f12d9..d374b8f22be 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_80.plan
index 935744f12d9..4c6ad5f9ef4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_80.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_80.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_81.plan
index 935744f12d9..34352f6ff55 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_81.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_81.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_82.plan
index 935744f12d9..811f5c7ee3b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_82.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_82.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_83.plan
index 935744f12d9..494ac15fd81 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_83.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_83.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_84.plan
index 935744f12d9..40491685a4a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_84.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_84.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_85.plan
index 935744f12d9..aa61d8dba3b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_85.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_85.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_86.plan
index 5100915c11e..ecdb8d8bde4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_86.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_86.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_87.plan
index 5100915c11e..ecdb8d8bde4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_87.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_87.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_88.plan
index 935744f12d9..83691c4e4b1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_88.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_88.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_89.plan
index 935744f12d9..b672381e79f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_89.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_89.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_9.plan
index 935744f12d9..d374b8f22be 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_90.plan
index 935744f12d9..7746ad559d0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_90.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_90.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_91.plan
index 935744f12d9..2f4f153ce71 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_91.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_91.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_92.plan
index 471bcc81a74..cd5137e8658 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_92.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_92.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_93.plan
index 471bcc81a74..54618df172e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_93.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_93.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_94.plan
index 935744f12d9..4a3149f904f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_94.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_94.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_95.plan
index 935744f12d9..54fbc759cdd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_95.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_95.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_96.plan
index 935744f12d9..cae82facc29 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_96.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_96.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_97.plan
index 935744f12d9..fb6d3a049bd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_97.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_97.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_98.plan
index 935744f12d9..22cbdeb748e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_98.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_98.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_99.plan
index 935744f12d9..6c09a64d925 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_99.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_99.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-4.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-4.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-4.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_1.plan
index d56509fb664..7a09bd869b3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_10.plan
index dc7a82d252d..fcb294c6168 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_100.plan
index dc7a82d252d..8ba8ba774da 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_100.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_100.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_101.plan
index a07838de627..17ffe28ce86 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_101.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_101.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_102.plan
index a07838de627..17ffe28ce86 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_102.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_102.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_103.plan
index 1741bf975f7..cca8633209d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_103.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_103.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_104.plan
index 1741bf975f7..4c670d61c5f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_104.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_104.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_105.plan
index dc7a82d252d..9b5eaf965d5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_105.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_105.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_106.plan
index dc7a82d252d..b2d212f1342 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_106.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_106.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_107.plan
index 666b9f9cdf0..5a69f9b6157 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_107.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_107.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_108.plan
index 666b9f9cdf0..5a69f9b6157 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_108.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_108.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_11.plan
index 1741bf975f7..fb5cdbfe8b6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_12.plan
index 1741bf975f7..f0892bd66dc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_13.plan
index 040c308a959..2d96eafc1a3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-5.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_14.plan
index 040c308a959..2d96eafc1a3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-5.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_15.plan
index 7c2bf22305f..f553215f847 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_16.plan
index 7c2bf22305f..f553215f847 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_17.plan
index 7c2bf22305f..2ef75e26ec8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_18.plan
index 7c2bf22305f..2ef75e26ec8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_19.plan
index ed568677113..10b9bf5ea58 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_2.plan
index d56509fb664..609ec917218 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_20.plan
index ed568677113..b8607999e1f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_21.plan
index 8ca71c435b9..bc1b3c6b5fa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-5.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_22.plan
index 8ca71c435b9..bc1b3c6b5fa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-5.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_23.plan
index dc7a82d252d..0b956f25fda 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_24.plan
index dc7a82d252d..95305896a41 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_25.plan
index dc7a82d252d..0b956f25fda 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_26.plan
index dc7a82d252d..5c794db673c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_27.plan
index 60152eb1e71..5b163e981e9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-5.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_28.plan
index 60152eb1e71..99493ee48ec 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_28.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_28.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-5.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_29.plan
index 54b8d501965..0f7e09111ff 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_29.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_29.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_3.plan
index dc7a82d252d..b7a6f675f10 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_30.plan
index 54b8d501965..e811eca8efd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_30.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_30.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_31.plan
index dc7a82d252d..56a7aae3a18 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_31.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_31.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_32.plan
index dc7a82d252d..1c01e4cf903 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_32.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_32.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_33.plan
index dc7a82d252d..03d2e1a3d24 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_33.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_33.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_34.plan
index dc7a82d252d..40f11187c0a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_34.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_34.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_35.plan
index dc7a82d252d..3d77e2dda2e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_35.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_35.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_36.plan
index dc7a82d252d..8fdb78a2780 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_36.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_36.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_37.plan
index dc7a82d252d..7467cf6317f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_37.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_37.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_38.plan
index dc7a82d252d..7467cf6317f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_38.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_38.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_39.plan
index dc7a82d252d..0e2dfc8f681 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_39.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_39.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_4.plan
index dc7a82d252d..f45bf53b1b6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_40.plan
index dc7a82d252d..860b20b763d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_40.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_40.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_41.plan
index dc7a82d252d..0e2dfc8f681 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_41.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_41.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_42.plan
index dc7a82d252d..5cfd04b7003 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_42.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_42.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_43.plan
index 1741bf975f7..bbc6c98b8fc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_43.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_43.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_44.plan
index 1741bf975f7..bbc6c98b8fc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_44.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_44.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_45.plan
index dc7a82d252d..88a6eccf765 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_45.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_45.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_46.plan
index dc7a82d252d..88a6eccf765 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_46.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_46.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_47.plan
index dc7a82d252d..88a6eccf765 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_47.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_47.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_48.plan
index dc7a82d252d..271b177822e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_48.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_48.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_49.plan
index dc7a82d252d..eeeb7e67ee3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_49.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_49.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_5.plan
index dc7a82d252d..fcb294c6168 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_50.plan
index dc7a82d252d..ee4ef473723 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_50.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_50.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_51.plan
index dc7a82d252d..1f197bd4a7f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_51.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_51.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_52.plan
index dc7a82d252d..83ef49d2f5b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_52.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_52.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_53.plan
index dc7a82d252d..b7a6f675f10 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_53.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_53.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_54.plan
index dc7a82d252d..c1e28a66606 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_54.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_54.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_55.plan
index 8ca71c435b9..337d4fa9ba0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_55.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_55.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-5.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_56.plan
index 8ca71c435b9..337d4fa9ba0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_56.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_56.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-5.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_57.plan
index 42d3ab932ff..5d9e5a760a5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_57.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_57.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_58.plan
index 42d3ab932ff..5d9e5a760a5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_58.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_58.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_59.plan
index dc7a82d252d..8adbc57e0c1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_59.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_59.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_6.plan
index dc7a82d252d..cbd45e3ce8a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_60.plan
index dc7a82d252d..8adbc57e0c1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_60.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_60.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_61.plan
index dc7a82d252d..8adbc57e0c1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_61.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_61.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_62.plan
index dc7a82d252d..8adbc57e0c1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_62.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_62.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_63.plan
index dc7a82d252d..39ca8ac564a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_63.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_63.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_64.plan
index dc7a82d252d..39ca8ac564a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_64.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_64.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_65.plan
index dc7a82d252d..d5921fd87e3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_65.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_65.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_66.plan
index dc7a82d252d..83a2913e2e4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_66.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_66.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_67.plan
index d56509fb664..059bcb95e24 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_67.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_67.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_68.plan
index d56509fb664..059bcb95e24 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_68.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_68.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_69.plan
index dc7a82d252d..d6ec6de6298 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_69.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_69.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_7.plan
index dc7a82d252d..fcb294c6168 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_70.plan
index dc7a82d252d..149f735f7ac 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_70.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_70.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_71.plan
index dc7a82d252d..ce982b24bde 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_71.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_71.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_72.plan
index dc7a82d252d..1516ee99aa7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_72.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_72.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_73.plan
index dc7a82d252d..ae24d8d3234 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_73.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_73.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_74.plan
index dc7a82d252d..a3d4669b226 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_74.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_74.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_75.plan
index 60152eb1e71..eb2066b6b55 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_75.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_75.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-5.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_76.plan
index 60152eb1e71..e858fdcfef8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_76.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_76.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-5.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_77.plan
index ac5be399e59..69da5304d14 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_77.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_77.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_78.plan
index ac5be399e59..3cb22f3e05a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_78.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_78.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_79.plan
index dc7a82d252d..0b956f25fda 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_79.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_79.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_8.plan
index dc7a82d252d..cbd45e3ce8a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_80.plan
index dc7a82d252d..1b2af756a12 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_80.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_80.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_81.plan
index a07838de627..e0d3e7963c5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_81.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_81.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_82.plan
index a07838de627..e0d3e7963c5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_82.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_82.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_83.plan
index dc7a82d252d..28f29945a93 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_83.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_83.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_84.plan
index dc7a82d252d..98c4f92c746 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_84.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_84.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_85.plan
index dc7a82d252d..01f9b7db165 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_85.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_85.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_86.plan
index dc7a82d252d..b55c8dcca71 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_86.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_86.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_87.plan
index dc7a82d252d..1206ccbb6c8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_87.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_87.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_88.plan
index dc7a82d252d..0b46982c460 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_88.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_88.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_89.plan
index dc7a82d252d..d2194d3336b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_89.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_89.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_9.plan
index dc7a82d252d..fcb294c6168 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_90.plan
index dc7a82d252d..291fef0a682 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_90.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_90.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_91.plan
index dc7a82d252d..1a9b76deb6d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_91.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_91.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_92.plan
index dc7a82d252d..72ec528dfc5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_92.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_92.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_93.plan
index dc7a82d252d..fa6e31c4421 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_93.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_93.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_94.plan
index dc7a82d252d..2b15a23f6a6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_94.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_94.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_95.plan
index dc7a82d252d..fa6e31c4421 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_95.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_95.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_96.plan
index dc7a82d252d..165752c1270 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_96.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_96.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_97.plan
index dc7a82d252d..366a8f6612d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_97.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_97.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_98.plan
index dc7a82d252d..366a8f6612d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_98.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_98.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_99.plan
index dc7a82d252d..8ba8ba774da 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_99.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_99.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-5.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-5.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-5.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_1.plan
index f6f487581ca..7995c6d122a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_10.plan
index f6f487581ca..21b96e3e90e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_100.plan
index f6f487581ca..72ca42a5c28 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_100.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_100.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_101.plan
index f6f487581ca..c87d7e51b5c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_101.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_101.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_102.plan
index f6f487581ca..2efb8934976 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_102.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_102.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_103.plan
index 40546ff1bbe..4251e9514b8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_103.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_103.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-6.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_104.plan
index 40546ff1bbe..582f77bf471 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_104.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_104.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-6.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_105.plan
index f6f487581ca..691275fb5ec 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_105.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_105.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_106.plan
index f6f487581ca..9da580dfb72 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_106.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_106.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_107.plan
index 05803280911..dea71ea1f70 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_107.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_107.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-6.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_108.plan
index 05803280911..c81d831d556 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_108.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_108.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-6.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_109.plan
index f6f487581ca..5345299d7c4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_109.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_109.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_11.plan
index f6f487581ca..54ba2110009 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_110.plan
index f6f487581ca..d1cb3d3e86f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_110.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_110.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_111.plan
index f6f487581ca..6598211b3fa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_111.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_111.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_112.plan
index f6f487581ca..d72e1850b90 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_112.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_112.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_113.plan
index f6f487581ca..cf1dcd1b3a8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_113.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_113.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_114.plan
index f6f487581ca..8b780f3b583 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_114.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_114.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_115.plan
index 1258f358a75..2acd07293ae 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_115.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_115.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 \\u003C 110 Or items2 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_116.plan
index 1258f358a75..d8a79617053 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_116.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_116.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 \\u003C 110 Or items2 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_117.plan
index 1258f358a75..554048b5217 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_117.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_117.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items2 \\u003C 110 Or items2 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_118.plan
index 1258f358a75..554048b5217 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_118.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_118.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items2 \\u003C 110 Or items2 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_119.plan
index 00cdd88b976..0dc51498ec8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_119.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_119.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_12.plan
index f6f487581ca..88ecd91c59b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_120.plan
index 00cdd88b976..0dc51498ec8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_120.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_120.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_121.plan
index 00cdd88b976..18ddb3d1937 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_121.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_121.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_122.plan
index 00cdd88b976..18ddb3d1937 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_122.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_122.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_123.plan
index f6f487581ca..2711a2f824e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_123.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_123.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_124.plan
index f6f487581ca..2711a2f824e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_124.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_124.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_125.plan
index f6f487581ca..553ef48fd97 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_125.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_125.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_126.plan
index f6f487581ca..553ef48fd97 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_126.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_126.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_127.plan
index f6f487581ca..4612c76cbc0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_127.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_127.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_128.plan
index f6f487581ca..4612c76cbc0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_128.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_128.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_129.plan
index baca7455a26..110992faa31 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_129.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_129.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_13.plan
index f6f487581ca..f68637c19d1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_130.plan
index baca7455a26..110992faa31 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_130.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_130.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_131.plan
index 40546ff1bbe..dc909891419 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_131.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_131.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-6.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_132.plan
index 40546ff1bbe..c5827444746 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_132.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_132.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-6.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_133.plan
index 40546ff1bbe..7dd0a9b4aca 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_133.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_133.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-6.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_134.plan
index 40546ff1bbe..85f31585c36 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_134.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_134.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-6.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col7 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_135.plan
index f6f487581ca..54ba2110009 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_135.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_135.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_136.plan
index f6f487581ca..f934f2df679 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_136.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_136.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_14.plan
index f6f487581ca..f68637c19d1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_15.plan
index f6f487581ca..54ba2110009 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_16.plan
index f6f487581ca..88ecd91c59b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_17.plan
index baca7455a26..d56c0e7f80e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_18.plan
index baca7455a26..32e73285e19 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_19.plan
index baca7455a26..15f52044d9b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_2.plan
index f6f487581ca..62e912fb845 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_20.plan
index baca7455a26..661889a0263 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_21.plan
index baca7455a26..15f52044d9b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_22.plan
index baca7455a26..661889a0263 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_23.plan
index f6f487581ca..76af7c5555b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_24.plan
index f6f487581ca..9ba36e91c1e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_25.plan
index f6f487581ca..9a31ad802e5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_26.plan
index f6f487581ca..9e0e7a8e373 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_27.plan
index f6f487581ca..9a31ad802e5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_28.plan
index f6f487581ca..f9dc1135a23 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_28.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_28.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_29.plan
index f6f487581ca..9a31ad802e5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_29.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_29.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_3.plan
index f6f487581ca..74e8c6c7348 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_30.plan
index f6f487581ca..7ffc9b14971 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_30.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_30.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_31.plan
index f6f487581ca..98e0b959ce0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_31.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_31.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_32.plan
index f6f487581ca..9e139d6820b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_32.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_32.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_33.plan
index 05803280911..4de700ec4c6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_33.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_33.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-6.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_34.plan
index 05803280911..4de700ec4c6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_34.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_34.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-6.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_35.plan
index 05803280911..4de700ec4c6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_35.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_35.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-6.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_36.plan
index 05803280911..4de700ec4c6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_36.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_36.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-6.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_37.plan
index baca7455a26..214df149bc5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_37.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_37.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_38.plan
index baca7455a26..efe6db5fc7f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_38.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_38.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_39.plan
index baca7455a26..214df149bc5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_39.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_39.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_4.plan
index f6f487581ca..1bc4838f928 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_40.plan
index baca7455a26..214df149bc5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_40.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_40.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_41.plan
index f6f487581ca..cb6bff7aae5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_41.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_41.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_42.plan
index f6f487581ca..fb138785265 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_42.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_42.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_43.plan
index f6f487581ca..cb6bff7aae5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_43.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_43.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_44.plan
index f6f487581ca..cb6bff7aae5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_44.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_44.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_45.plan
index f6f487581ca..cd40b002b55 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_45.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_45.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_46.plan
index f6f487581ca..8c472491e6f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_46.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_46.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_47.plan
index f6f487581ca..34d27ec889b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_47.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_47.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_48.plan
index f6f487581ca..881f6a1494c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_48.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_48.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_49.plan
index 40546ff1bbe..d6b3843a052 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_49.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_49.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-6.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_5.plan
index f6f487581ca..5b716b260c1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_50.plan
index 40546ff1bbe..9342ba8b8c0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_50.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_50.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-6.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_51.plan
index f6f487581ca..54ba2110009 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_51.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_51.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_52.plan
index f6f487581ca..695200f9270 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_52.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_52.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_53.plan
index f6f487581ca..54ba2110009 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_53.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_53.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_54.plan
index f6f487581ca..bea1d6f2aed 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_54.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_54.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_55.plan
index f6f487581ca..54ba2110009 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_55.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_55.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_56.plan
index f6f487581ca..45c463040c4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_56.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_56.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_57.plan
index f6f487581ca..54ba2110009 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_57.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_57.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_58.plan
index f6f487581ca..795df7935a5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_58.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_58.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_59.plan
index f6f487581ca..c3b4a9ec6fd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_59.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_59.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_6.plan
index f6f487581ca..bbe3486f76e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_60.plan
index f6f487581ca..c3b4a9ec6fd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_60.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_60.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_61.plan
index f6f487581ca..e4ecab08ff3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_61.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_61.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_62.plan
index f6f487581ca..e4ecab08ff3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_62.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_62.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_63.plan
index 00cdd88b976..a2481cd69e1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_63.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_63.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_64.plan
index 00cdd88b976..a2481cd69e1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_64.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_64.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_65.plan
index f6f487581ca..2eb23f7c695 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_65.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_65.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_66.plan
index f6f487581ca..6fea9ba3064 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_66.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_66.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_67.plan
index f6f487581ca..e94fdd8f975 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_67.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_67.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_68.plan
index f6f487581ca..e94fdd8f975 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_68.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_68.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_69.plan
index 059720eed8c..3e6628bd15e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_69.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_69.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_7.plan
index f6f487581ca..08f63a623d7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_70.plan
index 059720eed8c..7efed5a4e86 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_70.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_70.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_71.plan
index baca7455a26..b88df10172c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_71.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_71.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_72.plan
index baca7455a26..0c253681b0f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_72.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_72.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_73.plan
index baca7455a26..02e3f2d42b6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_73.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_73.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_74.plan
index baca7455a26..02e3f2d42b6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_74.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_74.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_75.plan
index f6f487581ca..410ddbc1cd8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_75.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_75.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_76.plan
index f6f487581ca..410ddbc1cd8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_76.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_76.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_77.plan
index f6f487581ca..7dff0f95d8a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_77.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_77.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_78.plan
index f6f487581ca..9d8e5df074f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_78.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_78.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_79.plan
index f6f487581ca..7dff0f95d8a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_79.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_79.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_8.plan
index f6f487581ca..08f63a623d7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_80.plan
index f6f487581ca..30034a6b612 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_80.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_80.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_81.plan
index baca7455a26..ff90ff96d3b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_81.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_81.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_82.plan
index baca7455a26..548cbb64b4c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_82.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_82.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_83.plan
index f6f487581ca..418f07c593e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_83.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_83.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_84.plan
index f6f487581ca..30036909b72 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_84.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_84.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_85.plan
index f6f487581ca..e22c4b5b808 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_85.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_85.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_86.plan
index f6f487581ca..dfd2e8b761c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_86.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_86.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_87.plan
index 5daae882912..a9d0767cf02 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_87.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_87.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_88.plan
index 5daae882912..a9d0767cf02 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_88.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_88.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_89.plan
index baca7455a26..84bad97adb2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_89.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_89.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_9.plan
index f6f487581ca..08f63a623d7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_90.plan
index baca7455a26..27f1637404d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_90.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_90.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_91.plan
index baca7455a26..ee9fc9e916d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_91.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_91.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_92.plan
index baca7455a26..ee9fc9e916d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_92.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_92.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_93.plan
index baca7455a26..4d6b7c324e7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_93.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_93.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_94.plan
index baca7455a26..4d6b7c324e7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_94.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_94.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_95.plan
index f6f487581ca..7f80da3d3df 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_95.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_95.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_96.plan
index f6f487581ca..7f80da3d3df 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_96.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_96.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_97.plan
index f6f487581ca..7f80da3d3df 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_97.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_97.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_98.plan
index f6f487581ca..7f80da3d3df 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_98.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_98.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_99.plan
index f6f487581ca..951d102eaf5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_99.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_99.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-6.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-6.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-6.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_1.plan
index 8af0ad32b1b..9c46f1d93d0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-7.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_10.plan
index 9125ce1cd46..6e223445b5b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_100.plan
index 9125ce1cd46..08634dffbb0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_100.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_100.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_101.plan
index 9125ce1cd46..4145e498974 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_101.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_101.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_102.plan
index 9125ce1cd46..aa3154f9353 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_102.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_102.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_103.plan
index 9125ce1cd46..4145e498974 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_103.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_103.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_104.plan
index 9125ce1cd46..11eabb2e863 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_104.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_104.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_105.plan
index 9125ce1cd46..086ec45b6dc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_105.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_105.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_106.plan
index 9125ce1cd46..cbe85902155 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_106.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_106.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_107.plan
index 9125ce1cd46..f10ab57cdbb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_107.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_107.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_108.plan
index 9125ce1cd46..c61bdf656d9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_108.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_108.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_109.plan
index 8af0ad32b1b..8caff91225b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_109.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_109.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-7.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_11.plan
index 9125ce1cd46..635c022e18a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_110.plan
index 8af0ad32b1b..f8a185866cc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_110.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_110.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-7.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_111.plan
index 9125ce1cd46..375a6fffe99 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_111.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_111.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_112.plan
index 9125ce1cd46..97ae74b6927 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_112.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_112.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_113.plan
index 8af0ad32b1b..dcc809fcc30 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_113.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_113.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-7.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_114.plan
index 8af0ad32b1b..d96562104f8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_114.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_114.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-7.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_115.plan
index 9125ce1cd46..aa0f53218f0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_115.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_115.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_116.plan
index 9125ce1cd46..51402e26528 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_116.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_116.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_117.plan
index 9125ce1cd46..aa0f53218f0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_117.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_117.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_118.plan
index 9125ce1cd46..f45e2b496c0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_118.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_118.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_119.plan
index 8af0ad32b1b..86248b245e5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_119.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_119.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-7.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_12.plan
index 9125ce1cd46..88dee5c1ddf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_120.plan
index 8af0ad32b1b..8586f6942a3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_120.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_120.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-7.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_121.plan
index 8af0ad32b1b..86248b245e5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_121.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_121.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-7.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_122.plan
index 8af0ad32b1b..98e3f62b38b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_122.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_122.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-7.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_123.plan
index 8af0ad32b1b..86248b245e5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_123.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_123.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-7.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_13.plan
index 9f413c865eb..1cc85b288a7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_14.plan
index 9f413c865eb..1cc85b288a7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_15.plan
index 9125ce1cd46..4145e498974 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_16.plan
index 9125ce1cd46..8a8e660f6d0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_17.plan
index 9125ce1cd46..4145e498974 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_18.plan
index 9125ce1cd46..aa3154f9353 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_19.plan
index 9125ce1cd46..086ec45b6dc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_2.plan
index 8af0ad32b1b..b67478600ee 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-7.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_20.plan
index 9125ce1cd46..cbe85902155 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_21.plan
index a02df46b75a..7b0051d2d7e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_22.plan
index a02df46b75a..7b0051d2d7e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_23.plan
index 9125ce1cd46..cb211834d64 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_24.plan
index 9125ce1cd46..cb211834d64 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_25.plan
index 9f413c865eb..6c8548c0ecb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_26.plan
index 9f413c865eb..596af1e0ca1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_27.plan
index 9f413c865eb..6c8548c0ecb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_28.plan
index 9f413c865eb..71997dc3fab 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_28.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_28.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_29.plan
index 9f413c865eb..6c8548c0ecb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_29.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_29.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_3.plan
index f72e96ab70c..6d38082a35a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_30.plan
index 9f413c865eb..2bc83cbbf49 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_30.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_30.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_31.plan
index 2970dc996f0..d1b13bbc13d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_31.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_31.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_32.plan
index 2970dc996f0..d1b13bbc13d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_32.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_32.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_33.plan
index 9125ce1cd46..989146e707f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_33.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_33.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_34.plan
index 9125ce1cd46..989146e707f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_34.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_34.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_35.plan
index 9125ce1cd46..76677c971c1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_35.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_35.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_36.plan
index 9125ce1cd46..76677c971c1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_36.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_36.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_37.plan
index 9f413c865eb..8054b7bedb9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_37.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_37.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_38.plan
index 9f413c865eb..19c9143f22d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_38.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_38.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_39.plan
index 9f413c865eb..351f4f0759d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_39.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_39.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_4.plan
index f72e96ab70c..44819401282 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_40.plan
index 9f413c865eb..c2b64545e37 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_40.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_40.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_41.plan
index 9f413c865eb..351f4f0759d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_41.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_41.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_42.plan
index 9f413c865eb..cf8374da3c1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_42.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_42.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_43.plan
index 9125ce1cd46..c1f5baebf8f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_43.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_43.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_44.plan
index 9125ce1cd46..1853fb72db7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_44.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_44.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_45.plan
index 9125ce1cd46..c1f5baebf8f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_45.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_45.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_46.plan
index 9125ce1cd46..fa89142364d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_46.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_46.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_47.plan
index 9f413c865eb..feb0dbee2bc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_47.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_47.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_48.plan
index 9f413c865eb..2ec230b9cdb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_48.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_48.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_49.plan
index 9125ce1cd46..072f8d1435f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_49.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_49.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_5.plan
index f72e96ab70c..0b7139b45cb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_50.plan
index 9125ce1cd46..991f1977a3f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_50.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_50.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_51.plan
index 9125ce1cd46..d55a679937a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_51.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_51.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_52.plan
index 9125ce1cd46..98044be26f3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_52.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_52.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_53.plan
index 9125ce1cd46..ec48dae285b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_53.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_53.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_54.plan
index 9125ce1cd46..61bb0eb7aa1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_54.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_54.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_55.plan
index 59b46d03d1b..b3abacb7649 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_55.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_55.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_56.plan
index 59b46d03d1b..b3abacb7649 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_56.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_56.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_57.plan
index 7ac1805f87b..64904138ed6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_57.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_57.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or items2 \\u003C 110 Or items2 \\u003E 150 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_58.plan
index 7ac1805f87b..64904138ed6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_58.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_58.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or items2 \\u003C 110 Or items2 \\u003E 150 Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_59.plan
index 7ac1805f87b..e94914cc7d2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_59.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_59.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items2 \\u003C 110 Or items2 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_6.plan
index f72e96ab70c..0b7139b45cb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_60.plan
index 7ac1805f87b..e94914cc7d2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_60.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_60.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items2 \\u003C 110 Or items2 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_61.plan
index 7ac1805f87b..e94914cc7d2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_61.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_61.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items2 \\u003C 110 Or items2 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_62.plan
index 7ac1805f87b..e94914cc7d2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_62.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_62.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or items2 \\u003C 110 Or items2 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_63.plan
index 9125ce1cd46..bed1094d8f7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_63.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_63.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_64.plan
index 9125ce1cd46..1e60e22a5ce 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_64.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_64.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_65.plan
index 9125ce1cd46..e81081ad5bc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_65.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_65.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_66.plan
index 9125ce1cd46..fe99b8eba83 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_66.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_66.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_67.plan
index 9125ce1cd46..e81081ad5bc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_67.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_67.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_68.plan
index 9125ce1cd46..fe99b8eba83 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_68.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_68.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_69.plan
index 9125ce1cd46..b7df24a5d6b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_69.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_69.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_7.plan
index 9125ce1cd46..c2b2b0b1dcf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_70.plan
index 9125ce1cd46..b7df24a5d6b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_70.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_70.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_71.plan
index 9125ce1cd46..42722ed34ff 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_71.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_71.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_72.plan
index 9125ce1cd46..0aa75d77831 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_72.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_72.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_73.plan
index 9125ce1cd46..6b58bc62654 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_73.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_73.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_74.plan
index 9125ce1cd46..a169f95a92a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_74.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_74.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_75.plan
index 9125ce1cd46..42722ed34ff 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_75.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_75.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_76.plan
index 9125ce1cd46..5e33027808c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_76.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_76.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_77.plan
index 9125ce1cd46..b881727973d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_77.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_77.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_78.plan
index 9125ce1cd46..b854ac389e5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_78.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_78.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_79.plan
index 9125ce1cd46..08da8fab06d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_79.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_79.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_8.plan
index 9125ce1cd46..ca7c075445b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_80.plan
index 9125ce1cd46..953cc9cc449 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_80.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_80.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_81.plan
index 9125ce1cd46..25e5efa5975 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_81.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_81.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_82.plan
index 9125ce1cd46..4ebd94b7325 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_82.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_82.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_83.plan
index 9125ce1cd46..fd87ea34b51 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_83.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_83.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_84.plan
index 9125ce1cd46..ba70bb71bdb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_84.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_84.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_85.plan
index 9125ce1cd46..fd87ea34b51 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_85.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_85.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_86.plan
index 9125ce1cd46..5705a36fed3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_86.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_86.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_87.plan
index 9125ce1cd46..375a6fffe99 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_87.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_87.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_88.plan
index 9125ce1cd46..dc63185b0f6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_88.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_88.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_89.plan
index 9f413c865eb..9b9b1afaaf3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_89.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_89.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_9.plan
index 9125ce1cd46..6e223445b5b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_90.plan
index 9f413c865eb..792a6856617 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_90.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_90.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_91.plan
index 653c683b8b2..ee319b754ec 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_91.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_91.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_92.plan
index 653c683b8b2..ee319b754ec 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_92.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_92.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_93.plan
index 9125ce1cd46..51f308a0374 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_93.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_93.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_94.plan
index 9125ce1cd46..0ff38f4071b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_94.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_94.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_95.plan
index 9125ce1cd46..79ec5ca984d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_95.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_95.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_96.plan
index 9125ce1cd46..5104e601a2f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_96.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_96.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_97.plan
index 9125ce1cd46..4bc4b873058 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_97.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_97.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_98.plan
index 9125ce1cd46..4bc4b873058 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_98.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_98.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_99.plan
index 9125ce1cd46..b0c1d131c27 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_99.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_99.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-7.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-7.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-7.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_1.plan
index 55b7c33ae23..50357683b37 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_10.plan
index 9242ea79195..bdf991334b0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And items2 \\u003C 110 Or items2 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_100.plan
index 7b535dbfd5f..c06cc4c0321 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_100.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_100.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And items1 \\u003C 110 Or items1 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_101.plan
index 7b535dbfd5f..c06cc4c0321 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_101.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_101.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And items1 \\u003C 110 Or items1 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_102.plan
index 7b535dbfd5f..802368d5f7b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_102.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_102.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items1 \\u003C 110 Or items1 \\u003E 150 And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_103.plan
index 7b535dbfd5f..802368d5f7b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_103.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_103.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items1 \\u003C 110 Or items1 \\u003E 150 And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_104.plan
index 8eccbdfbd7b..e0c7a8e3ac3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_104.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_104.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_105.plan
index 8eccbdfbd7b..fb895f1fc27 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_105.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_105.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_106.plan
index 8eccbdfbd7b..d48f7baf48f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_106.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_106.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_107.plan
index 8eccbdfbd7b..3b0ec0735eb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_107.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_107.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_108.plan
index 55b7c33ae23..3199cd18eb4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_108.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_108.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_109.plan
index 55b7c33ae23..95fcec98751 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_109.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_109.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_11.plan
index 9242ea79195..bdf991334b0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And items2 \\u003C 110 Or items2 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_110.plan
index 55b7c33ae23..fc5d5c64cd8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_110.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_110.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_111.plan
index 55b7c33ae23..1454e0b6d79 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_111.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_111.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_112.plan
index e1d56abe651..1e317a90b0f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_112.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_112.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_113.plan
index e1d56abe651..dce262134a1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_113.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_113.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_114.plan
index 55b7c33ae23..ee3408630de 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_114.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_114.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_115.plan
index 55b7c33ae23..9fcce3f5ae4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_115.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_115.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_116.plan
index 55b7c33ae23..21dd176783c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_116.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_116.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_117.plan
index 55b7c33ae23..826f3cccdf8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_117.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_117.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_118.plan
index 5fe170f1062..9c29560215f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_118.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_118.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_119.plan
index 5fe170f1062..9c29560215f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_119.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_119.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_12.plan
index 8eccbdfbd7b..e9c2b421b24 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_120.plan
index 55b7c33ae23..704c03caa40 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_120.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_120.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_121.plan
index 55b7c33ae23..18c0a5ac326 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_121.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_121.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_13.plan
index 8eccbdfbd7b..cd8e2d2b7e5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_14.plan
index 8eccbdfbd7b..a23bca8ee34 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_15.plan
index 8eccbdfbd7b..ada464177ca 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_16.plan
index 8eccbdfbd7b..a23bca8ee34 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_17.plan
index 8eccbdfbd7b..b680f795600 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_18.plan
index 8eccbdfbd7b..a23bca8ee34 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_19.plan
index 8eccbdfbd7b..5013c5408dc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_2.plan
index 55b7c33ae23..7c74313eee6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_20.plan
index 8eccbdfbd7b..2a29a7292ec 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_21.plan
index 8eccbdfbd7b..77e610c7574 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_22.plan
index e1d56abe651..60d2a7a2a1e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_23.plan
index e1d56abe651..0f191fbf5ea 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_24.plan
index 8eccbdfbd7b..2bbf15a53bb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_25.plan
index 8eccbdfbd7b..621b288a11a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_26.plan
index 8eccbdfbd7b..954386c29b1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_27.plan
index 8eccbdfbd7b..a9f046b086f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_28.plan
index e1d56abe651..2e501967bd4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_28.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_28.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_29.plan
index e1d56abe651..c0925fca312 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_29.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_29.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_3.plan
index 55b7c33ae23..5d2f44010a7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_30.plan
index e1d56abe651..65b0541ae93 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_30.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_30.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_31.plan
index e1d56abe651..65b0541ae93 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_31.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_31.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_32.plan
index 8eccbdfbd7b..bfa0e9100a9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_32.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_32.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_33.plan
index 8eccbdfbd7b..bfa0e9100a9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_33.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_33.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_34.plan
index 8eccbdfbd7b..38b1d13c7a7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_34.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_34.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_35.plan
index 8eccbdfbd7b..38b1d13c7a7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_35.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_35.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_36.plan
index 8eccbdfbd7b..bfa0e9100a9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_36.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_36.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_37.plan
index 8eccbdfbd7b..bfa0e9100a9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_37.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_37.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_38.plan
index 456593ef369..ba97769a420 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_38.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_38.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_39.plan
index 456593ef369..ba97769a420 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_39.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_39.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_4.plan
index e1d56abe651..65b0541ae93 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_40.plan
index 8eccbdfbd7b..5c31d74a72f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_40.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_40.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_41.plan
index 8eccbdfbd7b..d513c999ba4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_41.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_41.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_42.plan
index 8eccbdfbd7b..5c31d74a72f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_42.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_42.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_43.plan
index 8eccbdfbd7b..9e6866a437c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_43.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_43.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_44.plan
index 8eccbdfbd7b..c496b0b39af 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_44.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_44.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_45.plan
index 8eccbdfbd7b..1a7bd6af2c0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_45.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_45.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_46.plan
index 8eccbdfbd7b..ba419a8da37 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_46.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_46.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_47.plan
index 8eccbdfbd7b..fa0998b167e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_47.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_47.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_48.plan
index 8eccbdfbd7b..823d1c6fa62 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_48.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_48.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_49.plan
index 8eccbdfbd7b..16c5a81bb97 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_49.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_49.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_5.plan
index e1d56abe651..65b0541ae93 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_50.plan
index 8eccbdfbd7b..823d1c6fa62 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_50.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_50.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_51.plan
index 8eccbdfbd7b..5c18018af79 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_51.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_51.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_52.plan
index 8eccbdfbd7b..823d1c6fa62 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_52.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_52.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_53.plan
index 8eccbdfbd7b..e1023b4e704 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_53.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_53.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_54.plan
index 8eccbdfbd7b..823d1c6fa62 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_54.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_54.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_55.plan
index 8eccbdfbd7b..31a996be401 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_55.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_55.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_56.plan
index 69ac497975e..b2c35cba075 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_56.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_56.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_57.plan
index 69ac497975e..7769ed836e9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_57.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_57.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_58.plan
index 55b7c33ae23..8eb2751ff3c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_58.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_58.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_59.plan
index 55b7c33ae23..f15d0b46c17 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_59.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_59.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_6.plan
index 8eccbdfbd7b..0cc70fe225f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_60.plan
index 55b7c33ae23..26fc75dd470 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_60.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_60.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_61.plan
index 55b7c33ae23..3ad7ebd32c7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_61.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_61.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_62.plan
index 55b7c33ae23..8eb2751ff3c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_62.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_62.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_63.plan
index 55b7c33ae23..6cb854a8816 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_63.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_63.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_64.plan
index 86f7bc5c7e8..3280610af55 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_64.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_64.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_65.plan
index 86f7bc5c7e8..fe2d9a13427 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_65.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_65.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_66.plan
index 8eccbdfbd7b..2a29a7292ec 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_66.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_66.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_67.plan
index 8eccbdfbd7b..9005881290b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_67.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_67.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_68.plan
index e1d56abe651..4ac80f0eec2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_68.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_68.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_69.plan
index e1d56abe651..d28726e19d1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_69.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_69.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_7.plan
index 8eccbdfbd7b..c4231b6ebac 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_70.plan
index e1d56abe651..04982975538 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_70.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_70.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_71.plan
index e1d56abe651..04982975538 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_71.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_71.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_72.plan
index e1d56abe651..4ac80f0eec2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_72.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_72.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_73.plan
index e1d56abe651..d28726e19d1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_73.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_73.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_74.plan
index 8eccbdfbd7b..b0187de8fd6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_74.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_74.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_75.plan
index 8eccbdfbd7b..b8f09e5909f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_75.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_75.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_76.plan
index 8eccbdfbd7b..aa285f76ba2 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_76.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_76.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_77.plan
index 8eccbdfbd7b..eec183b09d9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_77.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_77.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_78.plan
index 8eccbdfbd7b..0c533f8bd58 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_78.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_78.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_79.plan
index 8eccbdfbd7b..10480f707f1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_79.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_79.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_8.plan
index 9242ea79195..b99cca70335 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 \\u003C 110 Or items2 \\u003E 150 And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_80.plan
index 55b7c33ae23..ed829397d6d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_80.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_80.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_81.plan
index 55b7c33ae23..211e51f076a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_81.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_81.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_82.plan
index 55b7c33ae23..1526cc5317d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_82.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_82.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... And ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_83.plan
index 55b7c33ae23..13b1fb2f4ae 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_83.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_83.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... And ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_84.plan
index 55b7c33ae23..877793de5c6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_84.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_84.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_85.plan
index 55b7c33ae23..19434fb1763 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_85.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_85.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_86.plan
index 55b7c33ae23..03c4e66a9ac 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_86.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_86.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_87.plan
index 55b7c33ae23..a8c919d8cf1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_87.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_87.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_88.plan
index 04076398bcd..2dbe7870b4c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_88.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_88.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_89.plan
index 04076398bcd..2dbe7870b4c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_89.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_89.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_9.plan
index 9242ea79195..b99cca70335 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items2 \\u003C 110 Or items2 \\u003E 150 And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_90.plan
index 04076398bcd..2dbe7870b4c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_90.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_90.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_91.plan
index 04076398bcd..2dbe7870b4c 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_91.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_91.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_92.plan
index ff3c3edcf47..928221ebf32 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_92.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_92.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_93.plan
index ff3c3edcf47..062a4a3d8f7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_93.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_93.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-8.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_94.plan
index 8eccbdfbd7b..8ebb120dd9e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_94.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_94.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_95.plan
index 8eccbdfbd7b..f3f21a01bf9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_95.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_95.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_96.plan
index 8eccbdfbd7b..fb09cf27ddb 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_96.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_96.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_97.plan
index 8eccbdfbd7b..19766bd36c4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_97.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_97.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_98.plan
index 8eccbdfbd7b..41bf2ab84d9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_98.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_98.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_99.plan
index 8eccbdfbd7b..72d1f799c31 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_99.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_99.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-8.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-8.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-8.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_1.plan
index 703478c15e5..3e4c22f7d02 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_10.plan
index 703478c15e5..2c601fb2361 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_10.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_10.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_100.plan
index 7f02396d399..c37df84ea48 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_100.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_100.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_101.plan
index 7f02396d399..b2cadada5ce 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_101.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_101.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_102.plan
index 7f02396d399..e0075d99142 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_102.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_102.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_103.plan
index 1b7293809ae..65f35a05d91 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_103.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_103.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_104.plan
index 1b7293809ae..65f35a05d91 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_104.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_104.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_105.plan
index 703478c15e5..c251c3ef407 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_105.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_105.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_106.plan
index 703478c15e5..9d8ec04f959 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_106.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_106.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_107.plan
index 703478c15e5..c251c3ef407 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_107.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_107.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_108.plan
index 703478c15e5..f7136294c87 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_108.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_108.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_109.plan
index 703478c15e5..c251c3ef407 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_109.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_109.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_11.plan
index 703478c15e5..8e58c4979ac 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_11.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_11.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_110.plan
index 703478c15e5..c1a85b36067 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_110.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_110.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_111.plan
index 703478c15e5..d4c012b4a02 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_111.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_111.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_112.plan
index 703478c15e5..2a5f4aa13e1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_112.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_112.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_113.plan
index 703478c15e5..d4c012b4a02 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_113.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_113.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_114.plan
index 703478c15e5..006a2336ef1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_114.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_114.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_115.plan
index 560b3701cfc..14c70fa9cfe 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_115.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_115.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_116.plan
index 560b3701cfc..14c70fa9cfe 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_116.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_116.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_117.plan
index 703478c15e5..921ad6bb689 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_117.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_117.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_118.plan
index 703478c15e5..444db3aa838 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_118.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_118.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_119.plan
index 703478c15e5..921ad6bb689 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_119.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_119.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_12.plan
index 703478c15e5..8e58c4979ac 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_12.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_12.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_120.plan
index 703478c15e5..921ad6bb689 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_120.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_120.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_121.plan
index 703478c15e5..921ad6bb689 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_121.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_121.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_122.plan
index 703478c15e5..921ad6bb689 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_122.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_122.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_123.plan
index 703478c15e5..82b13915e9f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_123.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_123.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_124.plan
index 703478c15e5..82b13915e9f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_124.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_124.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_125.plan
index 703478c15e5..bf492f8dff6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_125.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_125.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_126.plan
index 703478c15e5..bf492f8dff6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_126.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_126.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_127.plan
index 708b2f94316..da418215c04 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_127.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_127.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_128.plan
index 708b2f94316..b18b01e9338 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_128.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_128.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_129.plan
index 7f02396d399..5e4533cb370 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_129.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_129.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_13.plan
index 703478c15e5..47caaba812a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_13.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_13.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_130.plan
index 7f02396d399..3d5e3eae164 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_130.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_130.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_131.plan
index 703478c15e5..9dce66f9ef3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_131.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_131.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_132.plan
index 703478c15e5..dca84bea503 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_132.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_132.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_133.plan
index 7f02396d399..e245ffa9c3d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_133.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_133.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_134.plan
index 7f02396d399..d20d2c7473a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_134.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_134.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_135.plan
index 703478c15e5..da5912886a1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_135.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_135.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_136.plan
index 703478c15e5..da5912886a1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_136.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_136.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_137.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_137.plan
index 703478c15e5..da5912886a1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_137.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_137.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_138.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_138.plan
index 703478c15e5..da5912886a1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_138.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_138.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_139.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_139.plan
index 703478c15e5..2d1edd200d5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_139.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_139.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_14.plan
index 703478c15e5..47caaba812a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_14.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_14.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... And ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_140.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_140.plan
index 703478c15e5..d40d1917121 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_140.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_140.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_141.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_141.plan
index 708b2f94316..142bfd8ffcd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_141.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_141.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_142.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_142.plan
index 708b2f94316..142bfd8ffcd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_142.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_142.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_143.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_143.plan
index 703478c15e5..248ff6714cd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_143.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_143.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_144.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_144.plan
index 703478c15e5..13ce4ce6ee1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_144.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_144.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_145.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_145.plan
index 703478c15e5..248ff6714cd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_145.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_145.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_146.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_146.plan
index 703478c15e5..b68370ca89f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_146.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_146.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_147.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_147.plan
index 703478c15e5..248ff6714cd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_147.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_147.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_148.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_148.plan
index 703478c15e5..497a2396caf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_148.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_148.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_149.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_149.plan
index 703478c15e5..070680bdbb9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_149.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_149.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_15.plan
index 703478c15e5..e103a7c4623 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_15.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_15.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_150.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_150.plan
index 703478c15e5..7d5f58bcc3a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_150.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_150.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_16.plan
index 703478c15e5..e103a7c4623 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_17.plan
index 703478c15e5..878b9c14a85 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_17.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_17.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_18.plan
index 703478c15e5..295ee5304cf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_18.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_18.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... Or ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_19.plan
index 703478c15e5..12941edb824 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_19.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_19.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_2.plan
index 703478c15e5..402556ba7b6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_20.plan
index 703478c15e5..79fd5f9fedd 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_20.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_20.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_21.plan
index 7f02396d399..87cf9d845a3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_21.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_21.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_22.plan
index 7f02396d399..a1306aaaed6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_22.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_22.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_23.plan
index 7f02396d399..1fb033efe74 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_23.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_23.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_24.plan
index 7f02396d399..bd2cf9c07a1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_24.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_24.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or items3 \\u003C 110 Or items3 \\u003E 150\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_25.plan
index 703478c15e5..9670bb5058a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_25.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_25.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_26.plan
index 703478c15e5..2c6c31c1729 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_26.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_26.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_27.plan
index 7f02396d399..2bab1e7c145 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_27.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_27.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_28.plan
index 7f02396d399..6b0ce0c7400 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_28.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_28.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_29.plan
index 7f02396d399..43a39b22f2e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_29.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_29.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_3.plan
index 7f02396d399..b5045fd4cc0 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_30.plan
index 7f02396d399..d7744046435 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_30.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_30.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_31.plan
index 8778ce98076..4dd5e20ffae 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_31.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_31.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_32.plan
index 8778ce98076..4b064e44e57 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_32.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_32.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_33.plan
index 703478c15e5..9f7323b3f6a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_33.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_33.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_34.plan
index 703478c15e5..9d6d927e7f5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_34.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_34.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_35.plan
index 703478c15e5..92b135f6700 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_35.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_35.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_36.plan
index 703478c15e5..79675ab4dd7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_36.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_36.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_37.plan
index de765090ca8..0e2054fee9f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_37.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_37.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_38.plan
index de765090ca8..2707c0dc1d8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_38.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_38.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_39.plan
index 703478c15e5..4c64c2c9917 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_39.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_39.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_4.plan
index 7f02396d399..7c69567a369 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_4.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_4.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_40.plan
index 703478c15e5..34452dd57c1 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_40.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_40.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_41.plan
index 815940a983a..3b7f19a30a3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_41.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_41.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_42.plan
index 815940a983a..3b7f19a30a3 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_42.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_42.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And items3 \\u003C 110 Or items3 \\u003E 150\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_43.plan
index 815940a983a..fd2897a6b95 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_43.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_43.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_44.plan
index 815940a983a..fd2897a6b95 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_44.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_44.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_45.plan
index 703478c15e5..2d1edd200d5 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_45.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_45.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_46.plan
index 703478c15e5..66760ee5c22 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_46.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_46.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col5 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_47.plan
index 703478c15e5..76b3a0e0f07 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_47.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_47.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_48.plan
index 703478c15e5..76b3a0e0f07 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_48.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_48.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_49.plan
index 703478c15e5..83bf104d0bc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_49.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_49.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_5.plan
index 225f810d4dd..4d092a50052 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_50.plan
index 703478c15e5..dd71096730f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_50.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_50.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_51.plan
index 703478c15e5..83bf104d0bc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_51.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_51.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_52.plan
index 703478c15e5..83bf104d0bc 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_52.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_52.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_53.plan
index 703478c15e5..5b7c0b7ea67 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_53.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_53.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_54.plan
index 703478c15e5..755b7334476 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_54.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_54.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_55.plan
index 703478c15e5..e0e36d38b60 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_55.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_55.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_56.plan
index 703478c15e5..e0e36d38b60 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_56.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_56.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_57.plan
index 703478c15e5..e0e36d38b60 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_57.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_57.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_58.plan
index 703478c15e5..6f1dc1bd082 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_58.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_58.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_59.plan
index 703478c15e5..e0e36d38b60 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_59.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_59.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_6.plan
index 225f810d4dd..4d092a50052 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_6.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_6.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_60.plan
index 703478c15e5..6f1dc1bd082 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_60.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_60.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_61.plan
index 703478c15e5..7056352793b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_61.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_61.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_62.plan
index 703478c15e5..acccae86bae 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_62.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_62.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_63.plan
index 7f02396d399..f2d56da8e2b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_63.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_63.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_64.plan
index 7f02396d399..236ac160f65 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_64.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_64.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... Or ... Or ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_65.plan
index 7f02396d399..404ed12bb8b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_65.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_65.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_66.plan
index 7f02396d399..91920319885 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_66.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_66.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... Or ... Or ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_67.plan
index 815940a983a..2d3b37e2805 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_67.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_67.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_68.plan
index 815940a983a..774408412aa 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_68.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_68.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_69.plan
index 815940a983a..2d3b37e2805 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_69.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_69.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_7.plan
index 7f02396d399..43a39b22f2e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_70.plan
index 815940a983a..2d3b37e2805 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_70.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_70.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_71.plan
index de765090ca8..7661deb4a5a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_71.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_71.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_72.plan
index de765090ca8..7661deb4a5a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_72.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_72.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_73.plan
index 7f02396d399..cd3748924a7 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_73.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_73.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_74.plan
index 7f02396d399..f1b38e06ddf 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_74.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_74.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col7 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_75.plan
index 703478c15e5..cc48a8312f6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_75.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_75.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_76.plan
index 703478c15e5..cc48a8312f6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_76.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_76.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"items3 \\u003C 110 Or items3 \\u003E 150 And ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_77.plan
index 703478c15e5..473ef3a51ab 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_77.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_77.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_78.plan
index 703478c15e5..473ef3a51ab 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_78.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_78.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_79.plan
index 703478c15e5..473ef3a51ab 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_79.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_79.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_8.plan
index 7f02396d399..2b6928e4d3d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_80.plan
index 703478c15e5..473ef3a51ab 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_80.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_80.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"row.col1\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And items3 \\u003C 110 Or items3 \\u003E 150 And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_81.plan
index 703478c15e5..7056352793b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_81.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_81.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col4 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_82.plan
index 703478c15e5..6d08a4ce2e9 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_82.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_82.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_83.plan
index 815940a983a..a583e23fe77 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_83.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_83.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_84.plan
index 815940a983a..a583e23fe77 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_84.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_84.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_85.plan
index 703478c15e5..643201554a6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_85.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_85.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_86.plan
index 703478c15e5..64ec66ddd4e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_86.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_86.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_87.plan
index 703478c15e5..d6a15f9cfd6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_87.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_87.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_88.plan
index 703478c15e5..a30453d0f41 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_88.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_88.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col1 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_89.plan
index 703478c15e5..a1ecc49b2fe 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_89.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_89.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_9.plan
index 703478c15e5..0574aa12924 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_9.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_9.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col7 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_90.plan
index 703478c15e5..92da3a5639a 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_90.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_90.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... And ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_91.plan
index 610a184fae8..f8402a7f650 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_91.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_91.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_92.plan
index 610a184fae8..725942d512f 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_92.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_92.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col3 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_93.plan
index 54e31634a1b..0d85515fc7b 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_93.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_93.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_94.plan
index 54e31634a1b..9d6e74d8be8 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_94.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_94.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_95.plan
index 703478c15e5..5b7c0b7ea67 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_95.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_95.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_96.plan
index 703478c15e5..4b482a0a1d4 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_96.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_96.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\",\n                            \"col2 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_97.plan
index 703478c15e5..5b7c0b7ea67 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_97.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_97.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_98.plan
index 703478c15e5..5b7c0b7ea67 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_98.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_98.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"ResultSet_0_0\",\n            \"PlanNodeId\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Filter-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"... Or ...\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_99.plan
index 7f02396d399..b2cadada5ce 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_99.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_99.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.1\",\n      \"type\":\"query\"\n    },\n  \"tables\":\n    [\n      {\n        \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n        \"reads\":\n          [\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ]\n            },\n            {\n              \"type\":\"FullScan\",\n              \"scan_by\":\n                [\n                  \"a\",\n                  \"b\",\n                  \"c\",\n                  \"d\",\n                  \"e\"\n                ],\n              \"columns\":\n                [\n                  \"c\"\n                ]\n            }\n          ]\n      }\n    ]\n}"
\ No newline at end of file
+"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_select3-9.test_plan\\/t1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\",\n              \"d (-\u221e, +\u221e)\",\n              \"e (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"a\",\n              \"b\",\n              \"c\",\n              \"d\",\n              \"e\"\n            ]\n        }\n      ]\n  }\n],\n  \"Plan\":\n    {\n      \"Node Type\":\"Query\",\n      \"PlanNodeType\":\"Query\",\n      \"Plans\":\n        [\n          {\n            \"Node Type\":\"Precompute_0_0\",\n            \"Parent Relationship\":\"InitPlan\",\n            \"PlanNodeId\":4,\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":3,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":\n                                      [\n                                        \"a\",\n                                        \"b\",\n                                        \"c\",\n                                        \"d\",\n                                        \"e\"\n                                      ],\n                                    \"ReadRange\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\",\n                                        \"d (-\u221e, +\u221e)\",\n                                        \"e (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_select3-9.test_plan\\/t1\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ],\n            \"Subplan Name\":\"CTE tx_result_binding_0_0\"\n          },\n          {\n            \"Node Type\":\"ResultSet_1_0\",\n            \"PlanNodeId\":8,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Limit\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Limit\":\"1001\",\n                        \"Name\":\"Limit\"\n                      }\n                    ],\n                  \"PlanNodeId\":7,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"Merge\",\n                        \"PlanNodeId\":6,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"TopSort-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Limit\":\"1001\",\n                                    \"Name\":\"TopSort\",\n                                    \"TopSortBy\":\"\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":5,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Filter-TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"Filter\",\n                                                \"Predicate\":\"... And ... And ...\"\n                                              },\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"a\",\n                                                    \"b\",\n                                                    \"c\",\n                                                    \"d\",\n                                                    \"e\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"a (-\u221e, +\u221e)\",\n                                                    \"b (-\u221e, +\u221e)\",\n                                                    \"c (-\u221e, +\u221e)\",\n                                                    \"d (-\u221e, +\u221e)\",\n                                                    \"e (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"sqllogictest_select3-9.test_plan\\/t1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":3,\n                                          \"Tables\":\n                                            [\n                                              \"sqllogictest_select3-9.test_plan\\/t1\"\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":2,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"CTE Name\":\"tx_result_binding_1_0\",\n                                          \"Node Type\":\"ConstantExpr\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Iterator\":\"%kqp%tx_result_binding_0_0\",\n                                                \"Name\":\"Iterator\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1\n                                        }\n                                      ]\n                                  }\n                                ]\n                            }\n                          ],\n                        \"SortColumns\":\n                          [\n                            \"col6 (Asc)\",\n                            \"col4 (Asc)\",\n                            \"col5 (Asc)\",\n                            \"col2 (Asc)\",\n                            \"col3 (Asc)\",\n                            \"col1 (Asc)\"\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file
diff --git a/ydb/tests/functional/suite_tests/canondata/test_stream_query.TestStreamQuery.test_sql_suite_results-window.test_/window.test.out b/ydb/tests/functional/suite_tests/canondata/test_stream_query.TestStreamQuery.test_sql_suite_results-window.test_/window.test.out
index a119b3b90e3..5f783e76746 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_stream_query.TestStreamQuery.test_sql_suite_results-window.test_/window.test.out
+++ b/ydb/tests/functional/suite_tests/canondata/test_stream_query.TestStreamQuery.test_sql_suite_results-window.test_/window.test.out
@@ -1,4 +1,5 @@
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT depname, empno, salary, sum(salary) OVER w FROM empsalary WINDOW w AS (PARTITION BY depname) ORDER BY depname, salary;
@@ -19,6 +20,7 @@ SELECT depname, empno, salary, sum(salary) OVER w FROM empsalary WINDOW w AS (PA
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT depname, empno, salary, rank() OVER w FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary);
@@ -39,6 +41,7 @@ SELECT depname, empno, salary, rank() OVER w FROM empsalary WINDOW w AS (PARTITI
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT four, ten, SUM(SUM(four)) OVER w, AVG(ten) FROM tenk1
@@ -70,6 +73,7 @@ GROUP BY four, ten WINDOW w AS (PARTITION BY four) ORDER BY four, ten;
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT depname, empno, salary, sum(salary) OVER w FROM empsalary WINDOW w AS (PARTITION BY depname);
@@ -90,6 +94,7 @@ SELECT depname, empno, salary, sum(salary) OVER w FROM empsalary WINDOW w AS (PA
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT depname, empno, salary, rank() OVER w AS r FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary) ORDER BY r;
@@ -110,6 +115,7 @@ SELECT depname, empno, salary, rank() OVER w AS r FROM empsalary WINDOW w AS (PA
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT COUNT(*) OVER w FROM tenk1 WHERE unique2 < 10 WINDOW w AS ();
@@ -130,6 +136,7 @@ SELECT COUNT(*) OVER w FROM tenk1 WHERE unique2 < 10 WINDOW w AS ();
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT four FROM tenk1 WHERE FALSE WINDOW w AS (PARTITION BY ten);
@@ -138,6 +145,7 @@ SELECT four FROM tenk1 WHERE FALSE WINDOW w AS (PARTITION BY ten);
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT sum(four) OVER w AS sum_1, ten, four FROM tenk1 WHERE unique2 < 10 WINDOW w AS (PARTITION BY ten ORDER BY unique2);
@@ -158,6 +166,7 @@ SELECT sum(four) OVER w AS sum_1, ten, four FROM tenk1 WHERE unique2 < 10 WINDOW
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT row_number() OVER w FROM tenk1 WHERE unique2 < 10 WINDOW w AS (ORDER BY unique2);
@@ -178,6 +187,7 @@ SELECT row_number() OVER w FROM tenk1 WHERE unique2 < 10 WINDOW w AS (ORDER BY u
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT rank() OVER w AS rank_1, ten, four FROM tenk1 WHERE unique2 < 10 WINDOW w AS (PARTITION BY four ORDER BY ten);
@@ -198,6 +208,7 @@ SELECT rank() OVER w AS rank_1, ten, four FROM tenk1 WHERE unique2 < 10 WINDOW w
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT dense_rank() OVER w, ten, four FROM tenk1 WHERE unique2 < 10 WINDOW w AS (PARTITION BY four ORDER BY ten);
@@ -218,6 +229,7 @@ SELECT dense_rank() OVER w, ten, four FROM tenk1 WHERE unique2 < 10 WINDOW w AS
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT lag(ten) OVER w, ten, four FROM tenk1 WHERE unique2 < 10 WINDOW w AS (PARTITION BY four ORDER BY ten);
@@ -238,6 +250,7 @@ SELECT lag(ten) OVER w, ten, four FROM tenk1 WHERE unique2 < 10 WINDOW w AS (PAR
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT lead(ten) OVER w, ten, four FROM tenk1 WHERE unique2 < 10 WINDOW w AS (PARTITION BY four ORDER BY ten);
@@ -258,6 +271,7 @@ SELECT lead(ten) OVER w, ten, four FROM tenk1 WHERE unique2 < 10 WINDOW w AS (PA
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT lead(ten * 2, 1) OVER w, ten, four FROM tenk1 WHERE unique2 < 10 WINDOW w AS (PARTITION BY four ORDER BY ten);
@@ -278,6 +292,7 @@ SELECT lead(ten * 2, 1) OVER w, ten, four FROM tenk1 WHERE unique2 < 10 WINDOW w
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT first_value(ten) OVER w, ten, four FROM tenk1 WHERE unique2 < 10 WINDOW w AS (PARTITION BY four ORDER BY ten);
@@ -298,6 +313,7 @@ SELECT first_value(ten) OVER w, ten, four FROM tenk1 WHERE unique2 < 10 WINDOW w
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT last_value(four) OVER w, last_value(four) OVER w, ten, four FROM tenk1 WHERE unique2 < 10 WINDOW w AS (ORDER BY ten);
@@ -318,6 +334,7 @@ SELECT last_value(four) OVER w, last_value(four) OVER w, ten, four FROM tenk1 WH
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT last_value(ten) OVER w, ten, four FROM
@@ -341,6 +358,7 @@ ORDER BY four, ten;
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT ten, two, sum(hundred) AS gsum, sum(sum(hundred)) OVER w AS wsum
@@ -362,6 +380,7 @@ FROM tenk1 GROUP BY ten, two WINDOW w AS (PARTITION BY two ORDER BY ten);
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT count(*) OVER w, four FROM (SELECT * FROM tenk1 WHERE two = 1) WHERE unique2 < 10 WINDOW w AS (PARTITION BY four);
@@ -378,6 +397,7 @@ SELECT count(*) OVER w, four FROM (SELECT * FROM tenk1 WHERE two = 1) WHERE uniq
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT (count(*) OVER w + sum(hundred) OVER w) AS cntsum
@@ -400,6 +420,7 @@ WINDOW w AS (PARTITION BY four ORDER BY ten);
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT * FROM(
@@ -416,6 +437,7 @@ WHERE total <> fourcount + twosum;
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT avg(four) OVER w FROM tenk1 WHERE unique2 < 10 WINDOW w AS (PARTITION BY four ORDER BY thousand / 100);
@@ -436,6 +458,7 @@ SELECT avg(four) OVER w FROM tenk1 WHERE unique2 < 10 WINDOW w AS (PARTITION BY
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT ten, two, sum(hundred) AS gsum, sum(sum(hundred)) OVER win AS wsum
@@ -457,6 +480,7 @@ FROM tenk1 GROUP BY ten, two WINDOW win AS (PARTITION BY two ORDER BY ten);
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT sum(salary),
@@ -474,6 +498,7 @@ WINDOW w1 AS (ORDER BY depname), w2 AS (ORDER BY depname DESC);
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT sum(salary) OVER w1, count(*) OVER w2
@@ -495,6 +520,7 @@ FROM empsalary WINDOW w1 AS (ORDER BY salary), w2 AS (ORDER BY salary);
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT count(*) OVER w FROM (SELECT * FROM tenk1 WHERE FALSE) WINDOW w AS (PARTITION BY four);
@@ -503,6 +529,7 @@ SELECT count(*) OVER w FROM (SELECT * FROM tenk1 WHERE FALSE) WINDOW w AS (PARTI
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT sum(salary) OVER w, rank() OVER w FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary DESC);
@@ -523,6 +550,7 @@ SELECT sum(salary) OVER w, rank() OVER w FROM empsalary WINDOW w AS (PARTITION B
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT empno, depname, salary, bonus, depadj, MIN(bonus) OVER w, MAX(depadj) OVER w FROM(
@@ -554,6 +582,7 @@ WINDOW w AS (ORDER BY empno);
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT SUM(COUNT(f1)) OVER w FROM int4_tbl WHERE f1=42 WINDOW w AS ();
@@ -565,6 +594,7 @@ SELECT SUM(COUNT(f1)) OVER w FROM int4_tbl WHERE f1=42 WINDOW w AS ();
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 select ten,
@@ -591,6 +621,7 @@ order by ten;
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 select first_value(max(x)) over w, y
@@ -611,6 +642,7 @@ select first_value(max(x)) over w, y
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT four, ten,
@@ -645,6 +677,7 @@ WINDOW w AS (partition by four order by ten);
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT four, ten/4 as two,
@@ -679,6 +712,7 @@ WINDOW w AS (partition by four order by ten/4 rows between unbounded preceding a
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT sum(unique1) over w,
@@ -702,6 +736,7 @@ WINDOW w AS (rows between current row and unbounded following);
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT sum(unique1) over w,
@@ -725,6 +760,7 @@ WINDOW w AS (rows between 2 preceding and 2 following);
 
 
 --!syntax_v1
+PRAGMA Kikimr.UseNewEngine="True";
 pragma TablePathPrefix = "/Root/stream_query_window.test_results";
 pragma SimpleColumns;
 SELECT sum(unique1) over w,
diff --git a/ydb/tests/functional/suite_tests/postgres/select.test b/ydb/tests/functional/suite_tests/postgres/select.test
index b36812e0b15..4704bdd7ccf 100644
--- a/ydb/tests/functional/suite_tests/postgres/select.test
+++ b/ydb/tests/functional/suite_tests/postgres/select.test
@@ -178,7 +178,7 @@ statement query
 SELECT 2+2, 57
 UNION ALL
 select q1 as column0, q2 as column1 from int8_tbl
-order by column0
+order by column0, column1
 
 --
 -- Test ORDER BY options
diff --git a/ydb/tests/functional/suite_tests/test_base.py b/ydb/tests/functional/suite_tests/test_base.py
index 2043fee35d9..a2357e2cf65 100644
--- a/ydb/tests/functional/suite_tests/test_base.py
+++ b/ydb/tests/functional/suite_tests/test_base.py
@@ -173,7 +173,7 @@ def format_yql_statement(lines_or_statement, table_path_prefix):
     if not isinstance(lines_or_statement, list):
         lines_or_statement = [lines_or_statement]
     statement = "\n".join(
-        ['pragma TablePathPrefix = "%s";' % table_path_prefix, "pragma SimpleColumns;"] + lines_or_statement)
+        ["PRAGMA Kikimr.UseNewEngine=\"True\";", 'pragma TablePathPrefix = "%s";' % table_path_prefix, "pragma SimpleColumns;"] + lines_or_statement)
     return statement
 
 
@@ -238,21 +238,6 @@ def format_as_table(data):
 
 @six.add_metaclass(abc.ABCMeta)
 class BaseSuiteRunner(object):
-    check_new_engine_plan = True
-    check_new_engine_query_results = True
-    ignored_files = set([
-        "/Root/postgres_jointest/join3.test_plan",
-        "/Root/postgres_jointest/join4.test_plan",
-        "/Root/postgres_jointest/join2.test_plan",
-        "/Root/postgres_jointest/join0.test_plan",
-    ])
-
-    ignored_results_matching = set([
-        "/Root/postgres_select.test_results",
-        "/Root/postgres_jointest/join0.test_results",
-        "/Root/postgres_jointest/join4.test_results",
-    ])
-
     @classmethod
     def setup_class(cls):
         cls.cluster = kikimr_cluster_factory(
@@ -349,50 +334,6 @@ class BaseSuiteRunner(object):
     def get_query_and_output(self, statement_text):
         return statement_text, None
 
-    def format_new_engine(self, query):
-        return "\n".join(
-            [
-                "PRAGMA Kikimr.UseNewEngine=\"True\";",
-                query,
-            ]
-        )
-
-    def format_plan(self, plan):
-        plan = json.loads(plan)
-
-        def drop(what, j):
-            if what in j:
-                del j[what]
-
-        drop('meta', plan)
-        # new pg like plan, but use tables section to compare
-        drop('Plan', plan)
-
-        for table in plan.get('tables', []):
-            for write in table.get('writes', []):
-                drop('columns', write)
-                drop('key', write)
-                drop('scan_by', write)
-                drop('lookup_by', write)
-                # TODO(gvit): return limit checks
-                drop('limit', write)
-
-                if write.get('type') == 'Erase':
-                    write['type'] = 'MultiErase'
-
-            for read in table.get('reads', []):
-                drop('columns', read)
-                drop('key', read)
-                drop('scan_by', read)
-                drop('lookup_by', read)
-                # TODO(gvit): return limit checks
-                drop('limit', read)
-
-                if read.get('type') == 'Lookup':
-                    read['type'] = 'MultiLookup'
-
-        return self.pretty_json(plan)
-
     @staticmethod
     def pretty_json(j):
         return json.dumps(j, indent=4, sort_keys=True)
@@ -412,14 +353,6 @@ class BaseSuiteRunner(object):
                 query_name + '.plan',
             )
 
-            if self.check_new_engine_plan and self.table_path_prefix not in self.ignored_files:
-                new_engine_plan = self.explain(self.format_new_engine(statement.text))
-                self.execute_assert(
-                    self.format_plan(new_engine_plan),
-                    self.format_plan(query_plan),
-                    "New engine plan is not same with old engine."
-                )
-
             return
 
         actual_output, expected_output = safe_execute(get_actual_and_expected, statement, query_name)
@@ -501,25 +434,15 @@ class BaseSuiteRunner(object):
 
     def execute_query(self, statement_text):
         yql_text = format_yql_statement(statement_text, self.table_path_prefix)
-        old_engine_result = self.pool.retry_operation_sync(lambda s: s.transaction().execute(yql_text, commit_tx=True))
+        result = self.pool.retry_operation_sync(lambda s: s.transaction().execute(yql_text, commit_tx=True))
 
-        if len(old_engine_result) == 1:
+        if len(result) == 1:
             scan_query_result = self.execute_scan_query(yql_text)
-            for i in range(len(old_engine_result)):
+            for i in range(len(result)):
                 self.execute_assert(
-                    old_engine_result[i].rows,
+                    result[i].rows,
                     scan_query_result,
                     "Results are not same",
                 )
 
-        if self.check_new_engine_query_results and self.table_path_prefix not in self.ignored_results_matching:
-            new_engine_yql_text = self.format_new_engine(format_yql_statement(statement_text, self.table_path_prefix_ne))
-            new_engine_result = self.pool.retry_operation_sync(lambda s: s.transaction().execute(new_engine_yql_text, commit_tx=True))
-            assert len(old_engine_result) == len(new_engine_result)
-            for i in range(len(old_engine_result)):
-                self.execute_assert(
-                    old_engine_result[i].rows,
-                    new_engine_result[i].rows,
-                    "Results are not same",
-                )
-        return old_engine_result
+        return result
diff --git a/ydb/tests/functional/suite_tests/test_sql_logic.py b/ydb/tests/functional/suite_tests/test_sql_logic.py
index aa5b0d52925..83859f8dba4 100644
--- a/ydb/tests/functional/suite_tests/test_sql_logic.py
+++ b/ydb/tests/functional/suite_tests/test_sql_logic.py
@@ -16,7 +16,6 @@ from test_base import BaseSuiteRunner, get_token, get_test_suites, safe_execute,
 
 
 class TestSQLLogic(BaseSuiteRunner):
-    check_new_engine_plan = False
     check_new_engine_query_results = True
 
     def execute_assert(self, left, right, message):